Fix null pointer access in strhandle

[st.git] / st.c

diff --git a/st.c b/st.c
index 781dbf2..de2dd0e 100644 (file)
--- a/st.c
+++ b/st.c
@@ -1928,7 +1928,7 @@ strhandle(void)
                                fprintf(stderr, "erresc: invalid foreground color: %s\n", p);
                        else
                                redraw();
-                       break;
+                       return;
                case 11:
                        if (narg < 2)
                                break;
@@ -1941,7 +1941,7 @@ strhandle(void)
                                fprintf(stderr, "erresc: invalid background color: %s\n", p);
                        else
                                redraw();
-                       break;
+                       return;
                case 12:
                        if (narg < 2)
                                break;
@@ -1954,16 +1954,16 @@ strhandle(void)
                                fprintf(stderr, "erresc: invalid cursor color: %s\n", p);
                        else
                                redraw();
-                       break;
+                       return;
                case 4: /* color set */
                        if (narg < 3)
                                break;
                        p = strescseq.args[2];
                        /* FALLTHROUGH */
-               case 104: /* color reset, here p = NULL */
+               case 104: /* color reset */
                        j = (narg > 1) ? atoi(strescseq.args[1]) : -1;
 
-                       if (!strcmp(p, "?"))
+                       if (p && !strcmp(p, "?"))
                                osc4_color_response(j);
                        else if (xsetcolorname(j, p)) {
                                if (par == 104 && narg <= 1)