summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-08-09 18:54:05 +0300
committerAndrei Karas <akaras@inbox.ru>2016-08-09 18:54:05 +0300
commita5a5e617161531f48a9807f9e14765a545b711ec (patch)
tree2f9ecddaa8db0a486d0b60fddcf1da0c93b5c1ea
parented8d54d11d5e34523c04dbafe5a77a8228931e69 (diff)
downloadhercules-a5a5e617161531f48a9807f9e14765a545b711ec.tar.gz
hercules-a5a5e617161531f48a9807f9e14765a545b711ec.tar.bz2
hercules-a5a5e617161531f48a9807f9e14765a545b711ec.tar.xz
hercules-a5a5e617161531f48a9807f9e14765a545b711ec.zip
Fix false assert in script.c
-rw-r--r--src/map/script.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/map/script.c b/src/map/script.c
index 02cb223b2..7b66a05d4 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -3278,14 +3278,15 @@ void set_reg_instance_num(struct script_state* st, int64 num, const char* name,
int set_reg(struct script_state *st, struct map_session_data *sd, int64 num, const char *name, const void *value, struct reg_db *ref)
{
char prefix;
- nullpo_ret(st);
nullpo_ret(name);
prefix = name[0];
if (strlen(name) > SCRIPT_VARNAME_LENGTH) {
ShowError("script:set_reg: variable name too long. '%s'\n", name);
- script->reportsrc(st);
- st->state = END;
+ if (st) {
+ script->reportsrc(st);
+ st->state = END;
+ }
return 0;
}