Fix null pointer access in strhandle

[st.git] / st.c

diff --git a/st.c b/st.c
index ebdf3609b6a8eb6605791a91894868175b0ecc86..de2dd0ec88c489ac332b223fdef10923198c62d0 100644 (file)
--- a/st.c
+++ b/st.c
@@ -793,14 +793,15 @@ ttynew(const char *line, char *cmd, const char *out, char **args)
                break;
        case 0:
                close(iofd);
+               close(m);
                setsid(); /* create a new process group */
                dup2(s, 0);
                dup2(s, 1);
                dup2(s, 2);
                if (ioctl(s, TIOCSCTTY, NULL) < 0)
                        die("ioctl TIOCSCTTY failed: %s\n", strerror(errno));
-               close(s);
-               close(m);
+               if (s > 2)
+                       close(s);
 #ifdef __OpenBSD__
                if (pledge("stdio getpw proc exec", NULL) == -1)
                        die("pledge\n");
@@ -1841,6 +1842,42 @@ csireset(void)
        memset(&csiescseq, 0, sizeof(csiescseq));
 }
 
+void
+osc4_color_response(int num)
+{
+       int n;
+       char buf[32];
+       unsigned char r, g, b;
+
+       if (xgetcolor(num, &r, &g, &b)) {
+               fprintf(stderr, "erresc: failed to fetch osc4 color %d\n", num);
+               return;
+       }
+
+       n = snprintf(buf, sizeof buf, "\033]4;%d;rgb:%02x%02x/%02x%02x/%02x%02x\007",
+                    num, r, r, g, g, b, b);
+
+       ttywrite(buf, n, 1);
+}
+
+void
+osc_color_response(int index, int num)
+{
+       int n;
+       char buf[32];
+       unsigned char r, g, b;
+
+       if (xgetcolor(index, &r, &g, &b)) {
+               fprintf(stderr, "erresc: failed to fetch osc color %d\n", index);
+               return;
+       }
+
+       n = snprintf(buf, sizeof buf, "\033]%d;rgb:%02x%02x/%02x%02x/%02x%02x\007",
+                    num, r, r, g, g, b, b);
+
+       ttywrite(buf, n, 1);
+}
+
 void
 strhandle(void)
 {
@@ -1879,14 +1916,56 @@ strhandle(void)
                                }
                        }
                        return;
+               case 10:
+                       if (narg < 2)
+                               break;
+
+                       p = strescseq.args[1];
+
+                       if (!strcmp(p, "?"))
+                               osc_color_response(defaultfg, 10);
+                       else if (xsetcolorname(defaultfg, p))
+                               fprintf(stderr, "erresc: invalid foreground color: %s\n", p);
+                       else
+                               redraw();
+                       return;
+               case 11:
+                       if (narg < 2)
+                               break;
+
+                       p = strescseq.args[1];
+
+                       if (!strcmp(p, "?"))
+                               osc_color_response(defaultbg, 11);
+                       else if (xsetcolorname(defaultbg, p))
+                               fprintf(stderr, "erresc: invalid background color: %s\n", p);
+                       else
+                               redraw();
+                       return;
+               case 12:
+                       if (narg < 2)
+                               break;
+
+                       p = strescseq.args[1];
+
+                       if (!strcmp(p, "?"))
+                               osc_color_response(defaultcs, 12);
+                       else if (xsetcolorname(defaultcs, p))
+                               fprintf(stderr, "erresc: invalid cursor color: %s\n", p);
+                       else
+                               redraw();
+                       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 (xsetcolorname(j, p)) {
+
+                       if (p && !strcmp(p, "?"))
+                               osc4_color_response(j);
+                       else if (xsetcolorname(j, p)) {
                                if (par == 104 && narg <= 1)
                                        return; /* color reset without parameter */
                                fprintf(stderr, "erresc: invalid color j=%d, p=%s\n",