nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-25 01:02:24 +00:00
Code Issues Projects Releases Wiki Activity

Cope with a GdkEventKey having a NULL string field.

Browse Source 
When you run using the GDK Broadway backend, this turns out to happen,
and it's new in my experience - I was cheerfully iterating over
event->string and calling strlen on it without ever checking it for
NULL.
This commit is contained in:
Simon Tatham 2020-11-24 20:37:47 +00:00
parent 4ad554d23b
commit ffce7d8e70
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
unix/gtkwin.c
View File

@ -1035,6 +1035,7 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
bool force_format_numeric_keypad = false; bool force_format_numeric_keypad = false;
bool generated_something = false; bool generated_something = false;
char num_keypad_key = '\0'; char num_keypad_key = '\0';
const char *event_string = event->string ? event->string : "";
noise_ultralight(NOISE_SOURCE_KEY, event->keyval); noise_ultralight(NOISE_SOURCE_KEY, event->keyval);
@ -1106,11 +1107,11 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
string_string = dupstr(""); string_string = dupstr("");
{ {
int i; int i;
for (i = 0; event->string[i]; i++) { for (i = 0; event_string[i]; i++) {
char *old = string_string; char *old = string_string;
string_string = dupprintf("%s%s%02x", string_string, string_string = dupprintf("%s%s%02x", string_string,
string_string[0] ? " " : "", string_string[0] ? " " : "",
(unsigned)event->string[i] & 0xFF); (unsigned)event_string[i] & 0xFF);
sfree(old); sfree(old);
} }
} }
@ -1443,7 +1444,7 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
* confirmation.) * confirmation.)
*/ */
output_charset = CS_ISO8859_1; output_charset = CS_ISO8859_1;
strncpy(output+1, event->string, lenof(output)-1); strncpy(output+1, event_string, lenof(output)-1);
#else /* !GTK_CHECK_VERSION(2,0,0) */ #else /* !GTK_CHECK_VERSION(2,0,0) */
/* /*
* Most things can now be passed to * Most things can now be passed to
@ -1552,7 +1553,7 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
int ulen; int ulen;
wlen = mb_to_wc(DEFAULT_CODEPAGE, 0, wlen = mb_to_wc(DEFAULT_CODEPAGE, 0,
event->string, strlen(event->string), event_string, strlen(event_string),
widedata, lenof(widedata)-1); widedata, lenof(widedata)-1);
#ifdef KEY_EVENT_DIAGNOSTICS #ifdef KEY_EVENT_DIAGNOSTICS