system/weston
system/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston synced 2024-11-05 18:24:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

keyboard: Don't strcat() into a strdup()ed string

Browse source 
We need to reallocate the memory to hold the entire concatenated string,
but strcat() doesn't do that.

Closes: https://bugs.freedesktop.org/show_bug.cgi?id=71750
This commit is contained in:
Kristian Høgsberg 2014-01-09 23:45:18 -08:00
parent a548b4b85c
commit 700d6ad071
3 changed files with 28 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
clients/keyboard.c
View file

@ -490,6 +490,21 @@ delete_before_cursor(struct virtual_keyboard *keyboard)
memmove(keyboard->surrounding_text + keyboard->surrounding_cursor, end, strlen(end));
}
static char *
append(char *s1, const char *s2)
{
int len1, len2;
char *s;
len1 = strlen(s1);
len2 = strlen(s2);
s = xrealloc(s1, len1 + len2 + 1);
memcpy(s + len1, s2, len2);
s[len1 + len2] = '\0';
return s;
}
static void
keyboard_handle_key(struct keyboard *keyboard, uint32_t time, const struct key *key, struct input *input, enum wl_pointer_button_state state)
{
@ -502,8 +517,9 @@ keyboard_handle_key(struct keyboard *keyboard, uint32_t time, const struct key *
if (state != WL_POINTER_BUTTON_STATE_PRESSED)
break;
keyboard->keyboard->preedit_string = strcat(keyboard->keyboard->preedit_string,
label);
keyboard->keyboard->preedit_string =
append(keyboard->keyboard->preedit_string,
label);
virtual_keyboard_send_preedit(keyboard->keyboard, -1);
break;
case keytype_backspace:
@ -527,8 +543,8 @@ keyboard_handle_key(struct keyboard *keyboard, uint32_t time, const struct key *
case keytype_space:
if (state != WL_POINTER_BUTTON_STATE_PRESSED)
break;
keyboard->keyboard->preedit_string = strcat(keyboard->keyboard->preedit_string,
" ");
keyboard->keyboard->preedit_string =
append(keyboard->keyboard->preedit_string, " ");
virtual_keyboard_commit_preedit(keyboard->keyboard);
break;
case keytype_switch:

6
clients/window.c
View file

@ -5575,3 +5575,9 @@ xstrdup(const char *s)
{
return fail_on_null(strdup(s));
}
void *
xrealloc(char *p, size_t s)
{
return fail_on_null(realloc(p, s));
}

2
clients/window.h
View file

@ -61,6 +61,8 @@ void *
xzalloc(size_t s);
char *
xstrdup(const char *s);
void *
xrealloc(char *p, size_t s);
struct display *
display_create(int *argc, char *argv[]);