Browse Source

Fixed segmentation fault in script engine when activating DEBUG_RUN flag

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@7970 54d463be-8e91-2dee-dedb-b68131a5f0ec
toms 19 years ago
parent
commit
8dca441de7
2 changed files with 3 additions and 1 deletions
  1. 2 0
      Changelog-Trunk.txt
  2. 1 1
      src/map/script.c

+ 2 - 0
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]

+ 1 - 1
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;