mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

keyboard: Fix insert_text() string utility

Browse Source 
strncat() into a newly allocated buffer isn't well-defined.  I don't know
how this didn't crash all the time, getting blocks from malloc() with
a NUL in the first byte must be fairly common.

Closes: https://bugs.freedesktop.org/show_bug.cgi?id=71750
This commit is contained in:
Kristian Høgsberg
2014-01-09 23:39:20 -08:00
parent b0fb25dedc
commit a548b4b85c
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clients/keyboard.c
+6 -5
View File
@@ -384,12 +384,13 @@ resize_handler(struct widget *widget,
static char * static char *
insert_text(const char *text, uint32_t offset, const char *insert) insert_text(const char *text, uint32_t offset, const char *insert)
{ {
char *new_text = xmalloc(strlen(text) + strlen(insert) + 1); int tlen = strlen(text), ilen = strlen(insert);
char *new_text = xmalloc(tlen + ilen + 1);
strncat(new_text, text, offset); memcpy(new_text, text, offset);
new_text[offset] = '\0'; memcpy(new_text + offset, insert, ilen);
strcat(new_text, insert); memcpy(new_text + offset + ilen, text + offset, tlen - offset);
strcat(new_text, text + offset); new_text[tlen + ilen] = '\0';
return new_text; return new_text;
} }