aclindsa/st
1
0
Fork 0
Code Releases Activity

Avoid buffer overrun in kpress() and remove limit on shortcut strings.

Browse Source
This commit is contained in:
Mark Edgar
2013-10-05 11:45:44 +02:00
committed by Roberto E. Vargas Caballero
parent 02ae3ce6fd
commit 939e149544
1 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
st.c
View File

@@ -264,7 +264,7 @@ typedef struct {
typedef struct {
KeySym k;
uint mask;
char s[ESC_BUF_SIZ];
char *s;
/* three valued logic variables: 0 indifferent, 1 on, -1 off */
signed char appkey; /* application keypad */
signed char appcursor; /* application cursor */
@@ -3585,26 +3585,27 @@ kpress(XEvent *ev) {
/* 2. custom keys from config.h */
if((customkey = kmap(ksym, e->state))) {
len = strlen(customkey);
memcpy(buf, customkey, len);
/* 3. composed string from input method */
} else {
if(len == 0)
return;
if(len == 1 && e->state & Mod1Mask) {
if(IS_SET(MODE_8BIT)) {
if(*buf < 0177) {
c = *buf | 0x80;
len = utf8encode(&c, buf);
}
} else {
buf[1] = buf[0];
buf[0] = '\033';
len = 2;
}
}
ttywrite(customkey, len);
if(IS_SET(MODE_ECHO))
techo(customkey, len);
return;
}
/* 3. composed string from input method */
if(len == 0)
return;
if(len == 1 && e->state & Mod1Mask) {
if(IS_SET(MODE_8BIT)) {
if(*buf < 0177) {
c = *buf | 0x80;
len = utf8encode(&c, buf);
}
} else {
buf[1] = buf[0];
buf[0] = '\033';
len = 2;
}
}
ttywrite(buf, len);
if(IS_SET(MODE_ECHO))
techo(buf, len);