michael/st
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: michael:48dd3c0ab79de26b7d819fc10cf99ad70e4bc518
Branches Tags
michael:michael-work-2
michael:michael
michael:michael-work
..
compare: michael:de8132c8c2d3261f0f12d17c04b5607b401b5765
Branches Tags
michael:michael
michael:michael-work-2
michael:michael-work

3 Commits
48dd3c0ab7 ... de8132c8c2

Author SHA1 Message Date
Michael Peters
de8132c8c2 increase HISTSIZE 400% 2023-02-16 11:18:46 -08:00
Michael Peters
74ca444767 Merge branch 'master' into michael-work-2 2022-11-15 17:07:48 -08:00
Hiltjo Posthuma
e5e959835b fix buffer overflow when handling long composed input 
To reproduce the issue:

"
If you already have the multi-key enabled on your system, then add this line
to your ~/.XCompose file:

[...]
<question> <T> <E> <S> <T> <question> :
"1234567890123456789012345678901234567890123456789012345678901234567890"
"

Reported by and an initial patch by Andy Gozas <andy@gozas.me>, thanks!

Adapted the patch, for now st (like dmenu) handles a fixed amount of composed
characters, or otherwise ignores it. This is done for simplicity sake.
 2022-10-25 17:11:11 +02:00
2 changed files with 7 additions and 4 deletions
Show Stats Expand all files Collapse all files

2
st.c
View File

@ -36,7 +36,7 @@
#define CAR_PER_ARG 4 #define CAR_PER_ARG 4
#define STR_BUF_SIZ ESC_BUF_SIZ #define STR_BUF_SIZ ESC_BUF_SIZ
#define STR_ARG_SIZ ESC_ARG_SIZ #define STR_ARG_SIZ ESC_ARG_SIZ
#define HISTSIZE 2000 #define HISTSIZE 8000
#define RESIZEBUFFER 1000 #define RESIZEBUFFER 1000
/* macros */ /* macros */

9
x.c
View File

@ -2387,7 +2387,7 @@ void
kpress(XEvent *ev) kpress(XEvent *ev)
{ {
XKeyEvent *e = &ev->xkey; XKeyEvent *e = &ev->xkey;
KeySym ksym; KeySym ksym = NoSymbol;
char buf[64], *customkey; char buf[64], *customkey;
int len; int len;
Rune c; Rune c;
@ -2397,10 +2397,13 @@ kpress(XEvent *ev)
if (IS_SET(MODE_KBDLOCK)) if (IS_SET(MODE_KBDLOCK))
return; return;
if (xw.ime.xic) if (xw.ime.xic) {
len = XmbLookupString(xw.ime.xic, e, buf, sizeof buf, &ksym, &status); len = XmbLookupString(xw.ime.xic, e, buf, sizeof buf, &ksym, &status);
else if (status == XBufferOverflow)
return;
} else {
len = XLookupString(e, buf, sizeof buf, &ksym, NULL); len = XLookupString(e, buf, sizeof buf, &ksym, NULL);
}
/* 1. shortcuts */ /* 1. shortcuts */
for (bp = shortcuts; bp < shortcuts + LEN(shortcuts); bp++) { for (bp = shortcuts; bp < shortcuts + LEN(shortcuts); bp++) {
if (ksym == bp->keysym && match(bp->mod, e->state)) { if (ksym == bp->keysym && match(bp->mod, e->state)) {