commit a7a434ff80cfeb4442afa9ea0d93b528acb4cb12
Author: bit9tream <[email protected]>
Date:   Fri Jun 12 11:46:52 2020 +0300

    fix: segfault when there is something in selid and no item is selected

diff --git 
a/tools.suckless.org/dmenu/patches/multi-selection/dmenu-multi-selection-4.9.diff
 
b/tools.suckless.org/dmenu/patches/multi-selection/dmenu-multi-selection-4.9.diff
index 56312e3d..dffc70da 100644
--- 
a/tools.suckless.org/dmenu/patches/multi-selection/dmenu-multi-selection-4.9.diff
+++ 
b/tools.suckless.org/dmenu/patches/multi-selection/dmenu-multi-selection-4.9.diff
@@ -1,5 +1,5 @@
 diff --git a/dmenu.c b/dmenu.c
-index 6b8f51b..b621ce3 100644
+index 6b8f51b..6544112 100644
 --- a/dmenu.c
 +++ b/dmenu.c
 @@ -31,7 +31,8 @@ enum { SchemeNorm, SchemeSel, SchemeOut, SchemeLast }; /* 
color schemes */
@@ -55,16 +55,14 @@ index 6b8f51b..b621ce3 100644
                drw_setscheme(drw, scheme[SchemeOut]);
        else
                drw_setscheme(drw, scheme[SchemeNorm]);
-@@ -367,6 +381,22 @@ keypress(XKeyEvent *ev)
+@@ -367,6 +381,20 @@ keypress(XKeyEvent *ev)
                        goto draw;
                case XK_Return:
                case XK_KP_Enter:
-+                      if (!sel) return;
-+                      if (issel(sel->id)) {
++                      if (sel && issel(sel->id)) {
 +                              for (int i = 0;i < selidsize;i++)
 +                                      if (selid[i] == sel->id)
 +                                              selid[i] = -1;
-+                              return;
 +                      } else {
 +                              for (int i = 0;i < selidsize;i++)
 +                                      if (selid[i] == -1) {
@@ -78,14 +76,14 @@ index 6b8f51b..b621ce3 100644
                        break;
                case XK_bracketleft:
                        cleanup();
-@@ -464,13 +494,17 @@ insert:
+@@ -464,13 +492,17 @@ insert:
                break;
        case XK_Return:
        case XK_KP_Enter:
 -              puts((sel && !(ev->state & ShiftMask)) ? sel->text : text);
                if (!(ev->state & ControlMask)) {
 +                      for (int i = 0;i < selidsize;i++)
-+                              if (selid[i] != -1 && sel->id != selid[i])
++                              if (selid[i] != -1 && (!sel || sel->id != 
selid[i]))
 +                                      puts(items[selid[i]].text);
 +                      if (sel && !(ev->state & ShiftMask))
 +                              puts(sel->text);
@@ -99,7 +97,7 @@ index 6b8f51b..b621ce3 100644
                break;
        case XK_Right:
                if (text[cursor] != '-@@ -534,7 +568,7 @@ readstdin(void)
+@@ -534,7 +566,7 @@ readstdin(void)
                        *p = '                  if (!(items[i].text = 
strdup(buf)))
                        die("cannot strdup %u bytes:", strlen(buf) + 1);


Reply via email to