summaryrefslogtreecommitdiff
path: root/src/map/script.c
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2020-02-09 23:07:31 +0100
committerGitHub <noreply@github.com>2020-02-09 23:07:31 +0100
commit66b624165ba2e7c868b38081230a61691be447df (patch)
tree77b4c11f6500772c2e8b7106d3d1533d0fe07f42 /src/map/script.c
parentc4ab59ff86fc12d1e7643bbe55a2149c8dc0e56a (diff)
parentf2f6fdec4be88cc1fcb82d7882f3a2fcf0cad7bf (diff)
downloadhercules-66b624165ba2e7c868b38081230a61691be447df.tar.gz
hercules-66b624165ba2e7c868b38081230a61691be447df.tar.bz2
hercules-66b624165ba2e7c868b38081230a61691be447df.tar.xz
hercules-66b624165ba2e7c868b38081230a61691be447df.zip
Merge pull request #2619 from dastgirp/getunits/fix
Crash fixes
Diffstat (limited to 'src/map/script.c')
-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 b89176dba..875f193eb 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);