Browse Source

update

git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/stable@743 54d463be-8e91-2dee-dedb-b68131a5f0ec
ajarn 20 years ago
parent
commit
082fd563ec
2 changed files with 4 additions and 1 deletions
  1. 1 0
      Changelog.txt
  2. 3 1
      src/common/grfio.c

+ 1 - 0
Changelog.txt

@@ -1,5 +1,6 @@
 Date	Added
 Date	Added
 12/22
 12/22
+	* Fixed a bug in grfio_read causing memory corruptions [MouseJstr]
         * Rearranged how guild messages, gm messages, and party messages
         * Rearranged how guild messages, gm messages, and party messages
           are moved back and forth between the inter server and the
           are moved back and forth between the inter server and the
           map server.. eliminating unneeded round trips to eliminate
           map server.. eliminating unneeded round trips to eliminate

+ 3 - 1
src/common/grfio.c

@@ -492,8 +492,10 @@ void* grfio_reads(char *fname, int *size)
 		strncpy(lfname,fname,255);
 		strncpy(lfname,fname,255);
 		// i hope this is the correct way =p [celest]
 		// i hope this is the correct way =p [celest]
 		if ((rname=grfio_resnametable(fname,lfname))!=NULL) {			
 		if ((rname=grfio_resnametable(fname,lfname))!=NULL) {			
+			char tbuf[255];
 			//sprintf(rname,"%s",grfio_resnametable(fname,lfname));
 			//sprintf(rname,"%s",grfio_resnametable(fname,lfname));
-			sprintf(lfname,"%s%s",data_dir,rname);
+			sprintf(tbuf,"%s%s",data_dir,rname);
+			strcpy(lfname, tbuf);
 			//printf("%s\n",lfname);
 			//printf("%s\n",lfname);
 		}
 		}