Mercurial > hg > openttd
changeset 596:890611f300f7 draft
(svn r1018) -Fix: Buffer overflow in edit box, because we misuse maxlen for a flag..
someone should rewrite the editbox!
| author | truelight <truelight@openttd.org> |
|---|---|
| date | Sat, 11 Dec 2004 12:30:12 +0000 |
| parents | c3d73f673b20 |
| children | 181e46ddfe88 |
| files | misc_gui.c |
| diffstat | 1 files changed, 11 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/misc_gui.c +++ b/misc_gui.c @@ -17,6 +17,9 @@ bool _query_string_active; void SetFiosType(const byte fiostype); +/* Now this is what I call dirty.. the edit-box needs to be rewritten! */ +static bool _do_edit_on_text_even_when_no_change_to_edit_box; + typedef struct LandInfoData { Town *town; int32 costclear; @@ -780,7 +783,7 @@ case 3: DeleteWindow(w); break; case 4: press_ok:; - if (str_eq(WP(w,querystr_d).buf, WP(w,querystr_d).buf + MAX_QUERYSTR_LEN) && (WP(w,querystr_d).maxlen & 0x1000) == 0) { + if (str_eq(WP(w,querystr_d).buf, WP(w,querystr_d).buf + MAX_QUERYSTR_LEN) && !_do_edit_on_text_even_when_no_change_to_edit_box) { DeleteWindow(w); } else { byte *buf = WP(w,querystr_d).buf; @@ -876,6 +879,13 @@ } else { GetString(_orig_edit_str_buf, str); } + + if (maxlen & 0x1000) { + _do_edit_on_text_even_when_no_change_to_edit_box = true; + maxlen &= ~0x1000; + } else + _do_edit_on_text_even_when_no_change_to_edit_box = false; + _orig_edit_str_buf[maxlen] = 0; memcpy(_edit_str_buf, _orig_edit_str_buf, MAX_QUERYSTR_LEN);