From f2a30f077b4dfc261d8bb51ac22fbd4be9d892fa Mon Sep 17 00:00:00 2001 From: James Brown Date: Thu, 1 Aug 2002 09:36:07 +0000 Subject: [PATCH] Don't be an idiot, null terminate strings. :) svn-id: r4686 --- script_v1.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/script_v1.cpp b/script_v1.cpp index 97d40c6c0e5..c361418ffc0 100644 --- a/script_v1.cpp +++ b/script_v1.cpp @@ -2129,6 +2129,7 @@ void Scumm::o5_setObjectName() work[i++] = fetchScriptByte(); } } + work[i] = 0; if (obj < NUM_ACTORS) error("Can't set actor %d name with new-name-of", obj); @@ -2136,7 +2137,7 @@ void Scumm::o5_setObjectName() if (!getOBCDFromObject(obj)) { // FIXME: Bug 587553. This is an odd one and looks more like // an actual bug in the original script. Usually we would error - warning("Can't find OBCD to rename object %d to %s", obj, name); + warning("Can't find OBCD to rename object %d to %s", obj, work); return; } @@ -2157,12 +2158,10 @@ void Scumm::o5_setObjectName() } if (i >= size) { - work[i] = 0; warning("New name of object %d too long (old *%s* new *%s*)", obj, name, work); i = size - 1; } - work[i] = 0; strcpy((char *)name, (char *)work); runHook(0); }