summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-11-20 01:39:28 +0000
committerai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-11-20 01:39:28 +0000
commita02769bb772df079229b8ab57996c7afa519f3c0 (patch)
tree1457541d77e3cec66348d801cc465216a25272a4
parent836c83cc802c07fb3be0d38f3a10cf226462a442 (diff)
downloadhercules-a02769bb772df079229b8ab57996c7afa519f3c0.tar.gz
hercules-a02769bb772df079229b8ab57996c7afa519f3c0.tar.bz2
hercules-a02769bb772df079229b8ab57996c7afa519f3c0.tar.xz
hercules-a02769bb772df079229b8ab57996c7afa519f3c0.zip
* Fixed a crash when SqlStmt_ShowDebug is given NULL pointer as statement handle (since r10753, related r10818).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/renewal@14473 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Renewal.txt1
-rw-r--r--src/common/sql.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/Changelog-Renewal.txt b/Changelog-Renewal.txt
index a400034cd..d9a826e04 100644
--- a/Changelog-Renewal.txt
+++ b/Changelog-Renewal.txt
@@ -12,6 +12,7 @@ Date Added
* Made script command getmapxy print a warning, if an invalid type is supplied (related r69, r8459). [Ai4rei]
* Fixed pc_marriage not checking spouse character job for baby class. [Ai4rei]
* Removed ; from INTPTR_* defines (since r13449). [Ai4rei]
+ * Fixed a crash when SqlStmt_ShowDebug is given NULL pointer as statement handle (since r10753, related r10818). [Ai4rei]
2010/11/16
* Added a missing argument to a warning containing a format specifier. [Paradox924X]
2010/11/15
diff --git a/src/common/sql.c b/src/common/sql.c
index f7c45c631..d8e397e8d 100644
--- a/src/common/sql.c
+++ b/src/common/sql.c
@@ -920,7 +920,7 @@ void SqlStmt_ShowDebug_(SqlStmt* self, const char* debug_file, const unsigned lo
{
if( self == NULL )
ShowDebug("at %s:%lu - self is NULL\n", debug_file, debug_line);
- if( StringBuf_Length(&self->buf) > 0 )
+ else if( StringBuf_Length(&self->buf) > 0 )
ShowDebug("at %s:%lu - %s\n", debug_file, debug_line, StringBuf_Value(&self->buf));
else
ShowDebug("at %s:%lu\n", debug_file, debug_line);