mirror of
https://gitlab.freedesktop.org/wayland/weston
synced 2024-10-15 06:21:39 +00:00
keyboard: Fix insert_text() string utility
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:
parent
b0fb25dedc
commit
a548b4b85c
|
@ -384,12 +384,13 @@ resize_handler(struct widget *widget,
|
|||
static char *
|
||||
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);
|
||||
new_text[offset] = '\0';
|
||||
strcat(new_text, insert);
|
||||
strcat(new_text, text + offset);
|
||||
memcpy(new_text, text, offset);
|
||||
memcpy(new_text + offset, insert, ilen);
|
||||
memcpy(new_text + offset + ilen, text + offset, tlen - offset);
|
||||
new_text[tlen + ilen] = '\0';
|
||||
|
||||
return new_text;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue