summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDastgir <dastgirp@gmail.com>2020-01-25 17:18:37 +0530
committerJesusaves <cpntb1@ymail.com>2021-02-15 17:30:25 -0300
commit813042cc7da5f142962b7872244dea8504da7919 (patch)
treef082bd52676e48fdbc8c2e1cd74daca2066f5118
parentc4440e3c08e160324b0ca14c3b0c91179d8da85c (diff)
downloadhercules-813042cc7da5f142962b7872244dea8504da7919.tar.gz
hercules-813042cc7da5f142962b7872244dea8504da7919.tar.bz2
hercules-813042cc7da5f142962b7872244dea8504da7919.tar.xz
hercules-813042cc7da5f142962b7872244dea8504da7919.zip
map_forcountinmap will return 0 if invalid mapindex is provided
-rw-r--r--src/map/map.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/map/map.c b/src/map/map.c
index bb8adc7ec..2161f7023 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -657,9 +657,12 @@ static int map_foreachinmap(int (*func)(struct block_list*, va_list), int16 m, i
static int map_forcountinmap(int (*func)(struct block_list*, va_list), int16 m, int count, int type, ...)
{
- int returnCount;
+ int returnCount = 0;
va_list ap;
+ if (m < 0)
+ return returnCount;
+
va_start(ap, type);
returnCount = map->vforcountinarea(func, m, 0, 0, map->list[m].xs, map->list[m].ys, count, type, ap);
va_end(ap);