diff options
| author | toms <toms@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-07-29 15:10:00 +0000 |
|---|---|---|
| committer | toms <toms@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-07-29 15:10:00 +0000 |
| commit | dc28a60fa9820fb455408c5c1f80b514ba241cbc (patch) | |
| tree | f3d2839e5a6386478e95501d060c43714f2454ea | |
| parent | a9ee3b5cbf3d446ec888b7abbfa95c451ada2815 (diff) | |
| download | hercules-dc28a60fa9820fb455408c5c1f80b514ba241cbc.tar.gz hercules-dc28a60fa9820fb455408c5c1f80b514ba241cbc.tar.bz2 hercules-dc28a60fa9820fb455408c5c1f80b514ba241cbc.tar.xz hercules-dc28a60fa9820fb455408c5c1f80b514ba241cbc.zip | |
Fixed segmentation fault in script engine when activating DEBUG_RUN flag
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7970 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | src/map/script.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index c47403ead..03f954230 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -3,6 +3,8 @@ Date Added AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
+2006/07/29
+ * Fixed segmentation fault in script engine when activating DEBUG_RUN flag [Toms]
2006/07/28
* Added Ishizu's code to check ammo type on attack. No more using Grenade
rounds with Guns. [Skotlex]
diff --git a/src/map/script.c b/src/map/script.c index afa8b113a..729294f48 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -2458,6 +2458,7 @@ int run_func(struct script_state *st) int i,start_sp,end_sp,func; end_sp=st->stack->sp; + func=st->stack->stack_data[st->start].u.num; #ifdef DEBUG_RUN if(battle_config.etc_log) { ShowDebug("run_func : %s? (%d(%d)) sp=%d (%d...%d)\n",str_buf+str_data[func].str, func, str_data[func].type, st->stack->sp, st->start, st->end); @@ -2502,7 +2503,6 @@ int run_func(struct script_state *st) st->start=i-1; st->end=end_sp; - func=st->stack->stack_data[st->start].u.num; if(str_data[func].type!=C_FUNC ){ ShowMessage ("run_func: '"CL_WHITE"%s"CL_RESET"' (type %d) is not function and command!\n"); // st->stack->sp=0; |