From e177342cd0bd69313de720e5d42ffebe33b46e05 Mon Sep 17 00:00:00 2001 From: epoque11 Date: Sun, 29 Apr 2012 11:40:20 +0000 Subject: - Fixed a map-server crash when script variable storage reference is NULL (bugreport:5666) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16002 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/script.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src/map/script.c') diff --git a/src/map/script.c b/src/map/script.c index 856b2d95e..ad239ddcd 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -2537,7 +2537,10 @@ void get_val(struct script_state* st, struct script_data* data) data->ref ? *data->ref: name[1] == '@' ? st->stack->var_function:// instance/scope variable st->script->script_vars;// npc variable - data->u.str = (char*)idb_get(n,reference_getuid(data)); + if( n ) + data->u.str = (char*)idb_get(n,reference_getuid(data)); + else + data->u.str = NULL; } break; case '\'': @@ -2599,7 +2602,10 @@ void get_val(struct script_state* st, struct script_data* data) data->ref ? *data->ref: name[1] == '@' ? st->stack->var_function:// instance/scope variable st->script->script_vars;// npc variable - data->u.num = (int)idb_iget(n,reference_getuid(data)); + if( n ) + data->u.num = (int)idb_iget(n,reference_getuid(data)); + else + data->u.num = 0; } break; case '\'': -- cgit v1.2.3-60-g2f50