summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-02-25 16:15:09 +0000
committerFlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-02-25 16:15:09 +0000
commitb4b0462ea9eac4718cae3efc099579dcd14f2eed (patch)
tree6ff6681f1f13f5ecf91acc3fdb073fe684faa035
parent86dd5f28d4100ba6d0ddbd6f6c4f20579e0578d8 (diff)
downloadhercules-b4b0462ea9eac4718cae3efc099579dcd14f2eed.tar.gz
hercules-b4b0462ea9eac4718cae3efc099579dcd14f2eed.tar.bz2
hercules-b4b0462ea9eac4718cae3efc099579dcd14f2eed.tar.xz
hercules-b4b0462ea9eac4718cae3efc099579dcd14f2eed.zip
* Wrong variable being used in StringBuf_Vprintf. (follow up to r13386, fixes bugreport:2798)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13548 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--src/common/strlib.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index b534299a3..35b49a720 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -3,6 +3,8 @@ Date Added
AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
+2009/02/25
+ * Wrong variable being used in StringBuf_Vprintf. (follow up to r13386, fixes bugreport:2798) [FlavioJS]
2009/02/23
* Made mob_delayspawn check the spawn_timer in the mob. [FlavioJS]
* Added missing delete_timer's every time spawn_timer is being set. (except when allocating)
diff --git a/src/common/strlib.c b/src/common/strlib.c
index c0cc5b4ec..648a06d18 100644
--- a/src/common/strlib.c
+++ b/src/common/strlib.c
@@ -979,7 +979,7 @@ int StringBuf_Vprintf(StringBuf* self, const char* fmt, va_list ap)
/* Try to print in the allocated space. */
size = self->max_ - (self->ptr_ - self->buf_);
va_copy(apcopy, ap);
- n = vsnprintf(self->ptr_, size, fmt, ap);
+ n = vsnprintf(self->ptr_, size, fmt, apcopy);
va_end(apcopy);
/* If that worked, return the length. */
if( n > -1 && n < size )