From 2d6cf0c06e355b0e697b5372a03e189d75893502 Mon Sep 17 00:00:00 2001 From: FlavioJS Date: Thu, 19 Feb 2009 16:57:01 +0000 Subject: * Fixed impropper filling of w4 in npc_parsesrcfile when there are less than 4 fields. (bugreport:1063) * Simplified atcommand_spiritball. (deprecated msg_txt 204 and 205) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13538 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/npc.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'src/map/npc.c') diff --git a/src/map/npc.c b/src/map/npc.c index a95b490d9..1014cc832 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -2875,9 +2875,14 @@ void npc_parsesrcfile(const char* filepath) // fill w4 (to end of line) if( pos[1]-pos[8] > ARRAYLENGTH(w4)-1 ) ShowWarning("npc_parsesrcfile: w4 truncated, too much data (%d) in file '%s', line '%d'.\n", pos[1]-pos[8], filepath, strline(buffer,p-buffer)); - i = min(pos[1]-pos[8], ARRAYLENGTH(w4)-1); - memcpy(w4, p+pos[8], i*sizeof(char)); - w4[i] = '\0'; + if( pos[8] != -1 ) + { + i = min(pos[1]-pos[8], ARRAYLENGTH(w4)-1); + memcpy(w4, p+pos[8], i*sizeof(char)); + w4[i] = '\0'; + } + else + w4[0] = '\0'; if( count < 3 ) {// Unknown syntax -- cgit v1.2.3-60-g2f50