Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Fixed NPCs with closing parenthesis in their name could not be duplicated (bugreport:3235).

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14695 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
ai4rei 2011-02-06 01:45:10 +00:00
parent 0045508031
commit 1bb6a3d506
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog-Trunk.txt
View File

@ -1,6 +1,7 @@
Date Added Date Added
2011/02/05 2011/02/05
* Fixed NPCs with closing parenthesis in their name could not be duplicated (bugreport:3235). [Ai4rei]
* Fixed closing 'switch' curly not causing script EOL processing to trigger, leading to the script line after the switch being handled as belonging to the curly-less statement block (bugreport:3273, since r3422). [Ai4rei] * Fixed closing 'switch' curly not causing script EOL processing to trigger, leading to the script line after the switch being handled as belonging to the curly-less statement block (bugreport:3273, since r3422). [Ai4rei]
* Removed unnecessary getlogincount.pl, mapcheck.sh and mapchecker.sh tools (topic:262934). [Ai4rei] * Removed unnecessary getlogincount.pl, mapcheck.sh and mapchecker.sh tools (topic:262934). [Ai4rei]
2011/02/02 2011/02/02

9
src/map/npc.c
View File

@ -2263,6 +2263,7 @@ const char* npc_parse_duplicate(char* w1, char* w2, char* w3, char* w4, const ch
char srcname[128]; char srcname[128];
int i; int i;
const char* end; const char* end;
size_t length;
int src_id; int src_id;
int type; int type;
@ -2270,12 +2271,16 @@ const char* npc_parse_duplicate(char* w1, char* w2, char* w3, char* w4, const ch
struct npc_data* dnd; struct npc_data* dnd;
end = strchr(start,'\n'); end = strchr(start,'\n');
length = strlen(w2);
// get the npc being duplicated // get the npc being duplicated
if( sscanf(w2,"duplicate(%127[^)])",srcname) != 1 ) if( w2[length-1] != ')' || length <= 11 || length-11 >= sizeof(srcname) )
{ {// does not match 'duplicate(%127s)', name is empty or too long
ShowError("npc_parse_script: bad duplicate name in file '%s', line '%d' : %s\n", filepath, strline(buffer,start-buffer), w2); ShowError("npc_parse_script: bad duplicate name in file '%s', line '%d' : %s\n", filepath, strline(buffer,start-buffer), w2);
return end;// next line, try to continue return end;// next line, try to continue
} }
safestrncpy(srcname, w2+10, length-10);
dnd = npc_name2id(srcname); dnd = npc_name2id(srcname);
if( dnd == NULL) { if( dnd == NULL) {
ShowError("npc_parse_script: original npc not found for duplicate in file '%s', line '%d' : %s\n", filepath, strline(buffer,start-buffer), srcname); ShowError("npc_parse_script: original npc not found for duplicate in file '%s', line '%d' : %s\n", filepath, strline(buffer,start-buffer), srcname);