summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorDastgir <dastgirp@gmail.com>2020-01-25 17:15:36 +0530
committerDastgir <dastgirp@gmail.com>2020-01-25 17:15:36 +0530
commit7afdbbbad8d74f6a4a85417c99f114099a4930b8 (patch)
treeeec89dbb22e380d9fcade1b671090ba41a01dff2 /src/map
parentc03722679a01e5f181c2138565e95a6b0981a124 (diff)
downloadhercules-7afdbbbad8d74f6a4a85417c99f114099a4930b8.tar.gz
hercules-7afdbbbad8d74f6a4a85417c99f114099a4930b8.tar.bz2
hercules-7afdbbbad8d74f6a4a85417c99f114099a4930b8.tar.xz
hercules-7afdbbbad8d74f6a4a85417c99f114099a4930b8.zip
Added a check in getunits to not proceed if mapname is invalid.
Diffstat (limited to 'src/map')
-rw-r--r--src/map/script.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/map/script.c b/src/map/script.c
index 26bd678fe..039db8ceb 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -11775,6 +11775,13 @@ static BUILDIN(getunits)
const char *mapname = script_getstr(st, 5);
int16 m = map->mapname2mapid(mapname);
+ if (m == -1) {
+ ShowError("script:getunits: Invalid map(%s) provided.\n", mapname);
+ script->reportdata(data);
+ st->state = END;
+ return false;
+ }
+
if (script_hasdata(st, 9)) {
int16 x1 = script_getnum(st, 6);
int16 y1 = script_getnum(st, 7);