Преглед на файлове

Removed an incorrect range check and fixed a copypaste typo which caused script engine errors / crashes (see r11984)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11987 54d463be-8e91-2dee-dedb-b68131a5f0ec
ultramage преди 17 години
родител
ревизия
d75169014a
променени са 2 файла, в които са добавени 3 реда и са изтрити 6 реда
  1. 2 0
      Changelog-Trunk.txt
  2. 1 6
      src/map/pc.c

+ 2 - 0
Changelog-Trunk.txt

@@ -4,6 +4,8 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
 2007/12/27
+	* Removed an incorrect range check and fixed a copypaste typo which
+	  caused script engine errors / crashes (see r11984)
 	* Re-added a missing mob last_thinktime timer initialization when a mob
 	  spawns, causing mob AI to freeze (mistake in r11964) [ultramage]
 	* Changed the configure script:

+ 1 - 6
src/map/pc.c

@@ -5904,7 +5904,7 @@ int pc_setreg(struct map_session_data* sd, int reg, int val)
 	}
 
 	ARR_FIND( 0, sd->reg_num, i, sd->reg[i].data == 0 );
-	if( i == sd->regstr_num )
+	if( i == sd->reg_num )
 	{// nothing free, increase size
 		sd->reg_num++;
 		RECREATE(sd->reg, struct script_reg, sd->reg_num);
@@ -5936,11 +5936,6 @@ int pc_setregstr(struct map_session_data* sd, int reg, char* str)
 
 	nullpo_retr(0, sd);
 
-	if(str && strlen(str)+1 >= sizeof(sd->regstr[0].data)){
-		ShowWarning("pc_setregstr: string too long !\n");
-		return 0;
-	}
-
 	ARR_FIND( 0, sd->regstr_num, i, sd->regstr[i].index == reg );
 	if( i < sd->regstr_num )
 	{// found entry, update