diff options
| author | Haru <haru@dotalux.com> | 2015-06-19 01:05:09 +0200 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2015-08-09 21:14:02 +0200 |
| commit | 1c293cfb122b8d3e60d591d90083291331e29a15 (patch) | |
| tree | 7e0e5a598b9aa94219c50f5de360a1709dfc2dad | |
| parent | 5362e99716abb5e8a4e2b7f057af46a45a1d7cbf (diff) | |
| download | hercules-1c293cfb122b8d3e60d591d90083291331e29a15.tar.gz hercules-1c293cfb122b8d3e60d591d90083291331e29a15.tar.bz2 hercules-1c293cfb122b8d3e60d591d90083291331e29a15.tar.xz hercules-1c293cfb122b8d3e60d591d90083291331e29a15.zip | |
Added validation of the 'facing' value in top-level script objects
Signed-off-by: Haru <haru@dotalux.com>
| -rw-r--r-- | src/map/npc.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/src/map/npc.c b/src/map/npc.c index ad12d530c..50c2ee95b 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -2707,6 +2707,12 @@ const char* npc_parse_shop(char* w1, char* w2, char* w3, char* w4, const char* s return strchr(start,'\n');// skip and continue } + if (dir < 0 || dir > 7) { + ShowError("npc_parse_ship: Invalid NPC facing direction '%d' in file '%s', line '%d'.\n", dir, filepath, strline(buffer, start-buffer)); + if (retval) *retval = EXIT_FAILURE; + return strchr(start,'\n');//continue + } + m = map->mapname2mapid(mapname); } @@ -2932,6 +2938,13 @@ const char* npc_parse_script(char* w1, char* w2, char* w3, char* w4, const char* script_start = strstr(start,",{"); end = strchr(start,'\n'); + + if (dir < 0 || dir > 7) { + ShowError("npc_parse_script: Invalid NPC facing direction '%d' in file '%s', line '%d'.\n", dir, filepath, strline(buffer, start-buffer)); + if (retval) *retval = EXIT_FAILURE; + return npc->skip_script(script_start, buffer, filepath, retval); // continue + } + if( strstr(w4,",{") == NULL || script_start == NULL || (end != NULL && script_start > end) ) { ShowError("npc_parse_script: Missing left curly ',{' in file '%s', line '%d'. Skipping the rest of the file.\n * w1=%s\n * w2=%s\n * w3=%s\n * w4=%s\n", filepath, strline(buffer,start-buffer), w1, w2, w3, w4); @@ -3089,6 +3102,11 @@ const char* npc_parse_duplicate(char* w1, char* w2, char* w3, char* w4, const ch if (retval) *retval = EXIT_FAILURE; return end;// next line, try to continue } + if (dir < 0 || dir > 7) { + ShowError("npc_parse_duplicate: Invalid NPC facing direction '%d' in file '%s', line '%d'.\n", dir, filepath, strline(buffer, start-buffer)); + if (retval) *retval = EXIT_FAILURE; + return end; // try next + } m = map->mapname2mapid(mapname); } |