From ca02640ebb1f6e2bf4c400df638f979108c20556 Mon Sep 17 00:00:00 2001 From: Simon Date: Wed, 6 Apr 2011 13:14:13 +0100 Subject: [PATCH] Avoid potential overflow when pasting long text strings --- src/interface.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/interface.c b/src/interface.c index 1e8f44bee..98db488a9 100644 --- a/src/interface.c +++ b/src/interface.c @@ -395,9 +395,9 @@ void ui_edit_process(int mx, int my, int mb, ui_edit *ed) } else if(sdl_mod & (KMOD_CTRL) && sdl_key=='v')//paste { - char *paste = "foo"; //clipboard_pull_text(); + char *paste = clipboard_pull_text(); int pl = strlen(paste); - if ((textwidth(str)+textwidth(paste) > ed->w-14 && !ed->multiline) || (float)(((textwidth(str)+textwidth(paste))/(ed->w-14)*12) > ed->h && ed->multiline)) + if ((textwidth(str)+textwidth(paste) > ed->w-14 && !ed->multiline) || (pl+strlen(ed->str)>255) || (float)(((textwidth(str)+textwidth(paste))/(ed->w-14)*12) > ed->h && ed->multiline)) break; memmove(ed->str+ed->cursor+pl, ed->str+ed->cursor, l+pl-ed->cursor); memcpy(ed->str+ed->cursor,paste,pl);