summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorajarn <ajarn@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-12-23 04:57:29 +0000
committerajarn <ajarn@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-12-23 04:57:29 +0000
commit8b050adff043c24bca4df7726c5b2bce0edf36ae (patch)
tree329336fa495e633a0c7d39c883c62bbccb56ebb6
parent9df6835f9595c43d1110c9b83b33cea72be993d5 (diff)
downloadhercules-8b050adff043c24bca4df7726c5b2bce0edf36ae.tar.gz
hercules-8b050adff043c24bca4df7726c5b2bce0edf36ae.tar.bz2
hercules-8b050adff043c24bca4df7726c5b2bce0edf36ae.tar.xz
hercules-8b050adff043c24bca4df7726c5b2bce0edf36ae.zip
update
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@743 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog.txt1
-rw-r--r--src/common/grfio.c4
2 files changed, 4 insertions, 1 deletions
diff --git a/Changelog.txt b/Changelog.txt
index e7aca8df0..e4164a59c 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,5 +1,6 @@
Date Added
12/22
+ * Fixed a bug in grfio_read causing memory corruptions [MouseJstr]
* Rearranged how guild messages, gm messages, and party messages
are moved back and forth between the inter server and the
map server.. eliminating unneeded round trips to eliminate
diff --git a/src/common/grfio.c b/src/common/grfio.c
index b005398cc..d27636d33 100644
--- a/src/common/grfio.c
+++ b/src/common/grfio.c
@@ -492,8 +492,10 @@ void* grfio_reads(char *fname, int *size)
strncpy(lfname,fname,255);
// i hope this is the correct way =p [celest]
if ((rname=grfio_resnametable(fname,lfname))!=NULL) {
+ char tbuf[255];
//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);
}