osama/st
1
0
Fork 0
mirror of https://github.com/mintycube/st.git synced 2024-10-22 14:05:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix null pointer access in strhandle

Browse Source 
According to the spec the argument is optional for 104, so p can be
NULL as can be tested with printf '\x1b]104\x07'. This is a regression
of 8e31030.

Ref.
   - https://git.suckless.org/st/commit/a0467c802d4f86ed162486e3453dd61181423902.html
This commit is contained in:
bakkeby 2022-02-24 13:25:36 +01:00
parent 9ab02993c3
commit 1a7cc16bec
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
st.c
View File

@ -2525,7 +2525,7 @@ strhandle(void)
break; break;
p = strescseq.args[((par == 4) ? 2 : 1)]; p = strescseq.args[((par == 4) ? 2 : 1)];
/* FALLTHROUGH */ /* FALLTHROUGH */
case 104: /* color reset, here p = NULL */ case 104: /* color reset */
if (par == 10) if (par == 10)
j = defaultfg; j = defaultfg;
else if (par == 11) else if (par == 11)
@ -2535,7 +2535,7 @@ strhandle(void)
else else
j = (narg > 1) ? atoi(strescseq.args[1]) : -1; j = (narg > 1) ? atoi(strescseq.args[1]) : -1;
if (!strcmp(p, "?")) if (p && !strcmp(p, "?"))
osc4_color_response(j); osc4_color_response(j);
else if (xsetcolorname(j, p)) { else if (xsetcolorname(j, p)) {
if (par == 104 && narg <= 1) if (par == 104 && narg <= 1)