diff options
| author | Ole Loots <ole@monochrom.net> | 2013-01-31 19:28:26 +0100 |
|---|---|---|
| committer | Ole Loots <ole@monochrom.net> | 2013-01-31 19:28:26 +0100 |
| commit | 0703404654d2a40cacae2d94c6e0e22ca28b4acf (patch) | |
| tree | bfdbe1e8952814f73a6b0e190ae0a77fd0cfc7bd /render/textinput.c | |
| parent | 54f719aa960159c5b1978846223732c9669ca7fa (diff) | |
| parent | 89856f55929907642013e45435b9d18cd1fafe36 (diff) | |
| download | netsurf-mono/removing-windom-dependency.tar.gz netsurf-mono/removing-windom-dependency.tar.bz2 | |
Merge branch 'master' into mono/removing-windom-dependencymono/removing-windom-dependency
Conflicts:
atari/toolbar.c
Diffstat (limited to 'render/textinput.c')
| -rw-r--r-- | render/textinput.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/render/textinput.c b/render/textinput.c index 71b4e53e0..e9c6df7b2 100644 --- a/render/textinput.c +++ b/render/textinput.c @@ -1380,12 +1380,12 @@ bool textinput_textarea_callback(struct browser_window *bw, uint32_t key, case KEY_PASTE: { - char *buff; + char *buff = NULL; size_t buff_len; bool success; gui_get_clipboard(&buff, &buff_len); - if (utf8 == NULL) + if (buff == NULL) return false; success = browser_window_paste_text(bw, buff, buff_len, true); @@ -2027,12 +2027,12 @@ bool textinput_input_callback(struct browser_window *bw, uint32_t key, case KEY_PASTE: { - char *buff; + char *buff = NULL; size_t buff_len; bool success; gui_get_clipboard(&buff, &buff_len); - if (utf8 == NULL) + if (buff == NULL) return false; success = browser_window_paste_text(bw, buff, buff_len, true); |