From 52c49e45fb8da3dc0fa7c9d26d34c39b4a7cbc71 Mon Sep 17 00:00:00 2001 From: mfrancis95 Date: Tue, 1 Jan 2019 03:18:03 -0500 Subject: [PATCH 1/2] Apply @fabiangreffrath's patch to fix a memory error in Hexen --- src/hexen/sc_man.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/hexen/sc_man.c b/src/hexen/sc_man.c index 3778fd97..1ebd1700 100644 --- a/src/hexen/sc_man.c +++ b/src/hexen/sc_man.c @@ -197,16 +197,16 @@ boolean SC_GetString(void) { while (*ScriptPtr <= 32) { - if (ScriptPtr >= ScriptEndPtr) - { - sc_End = true; - return false; - } if (*ScriptPtr++ == '\n') { sc_Line++; sc_Crossed = true; } + if (ScriptPtr >= ScriptEndPtr) + { + sc_End = true; + return false; + } } if (ScriptPtr >= ScriptEndPtr) { From a3d41baca4d77441fa55b1d8f9963004667068d0 Mon Sep 17 00:00:00 2001 From: mfrancis95 Date: Tue, 8 Jan 2019 15:10:11 -0500 Subject: [PATCH 2/2] Remove redundancy in previous commit --- src/hexen/sc_man.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/hexen/sc_man.c b/src/hexen/sc_man.c index 1ebd1700..489bc72e 100644 --- a/src/hexen/sc_man.c +++ b/src/hexen/sc_man.c @@ -195,18 +195,13 @@ boolean SC_GetString(void) } while (foundToken == false) { - while (*ScriptPtr <= 32) + while (ScriptPtr < ScriptEndPtr && *ScriptPtr <= 32) { if (*ScriptPtr++ == '\n') { sc_Line++; sc_Crossed = true; } - if (ScriptPtr >= ScriptEndPtr) - { - sc_End = true; - return false; - } } if (ScriptPtr >= ScriptEndPtr) {