From: Chris Porter <redacted>
Date: Mon, 23 Sep 2013 23:35:42 +0000 (+0100)
Subject: DBAPI2: fix initialisation bug (thanks to anders for crash logs)
X-Git-Url: https://jfr.im/git/irc/quakenet/newserv.git/commitdiff_plain/3a7332dd88588dd515baa44330117fa3c2af84e8

DBAPI2: fix initialisation bug (thanks to anders for crash logs)
---

diff --git a/dbapi2/dbapi2-adapter.inc b/dbapi2/dbapi2-adapter.inc
index cfb555a3..4bfaddc3 100644
--- a/dbapi2/dbapi2-adapter.inc
+++ b/dbapi2/dbapi2-adapter.inc
@@ -10,6 +10,8 @@
 #include "../lib/stringbuf.h"
 #include "../lib/version.h"
 
+#include <string.h>
+
 static DBAPI2_HANDLE *dbapi2_adapter_new(const DBAPIConn *);
 static void dbapi2_adapter_close(DBAPIConn *);
 
@@ -94,8 +96,11 @@ static DBAPIResult *wrapresult(DBAPIResult *r, DBConn *c) {
   if(!c)
     return NULL;
 
-  if(!r)
+  if(!r) {
     r = calloc(1, sizeof(DBAPIResult));
+  } else {
+    memset(r, 0, sizeof(DBAPIResult));
+  }
 
   r->clear = dbapi2_adapter_result_clear;
   r->handle = dbgetresult(c);