From 8e9bbde6edef837d5d834cac69a5cfc3b8315993 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Canna=C3=B2?= <rene.cannao@gmail.com>
Date: Tue, 20 Sep 2016 15:59:51 +0000
Subject: [PATCH] Crash when computing memory usage for mirrored sessions #699

---
 lib/MySQL_Protocol.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/MySQL_Protocol.cpp b/lib/MySQL_Protocol.cpp
index a760919ad..13293531d 100644
--- a/lib/MySQL_Protocol.cpp
+++ b/lib/MySQL_Protocol.cpp
@@ -1547,6 +1547,8 @@ unsigned long long MySQL_ResultSet::current_size() {
 	unsigned long long intsize=0;
 	intsize+=sizeof(MySQL_ResultSet);
 	intsize+=RESULTSET_BUFLEN; // size of buffer
+	if (PSarrayOUT==NULL)	// see bug #699
+		return intsize;
 	intsize+=sizeof(PtrSizeArray);
 	intsize+=(PSarrayOUT->size*sizeof(PtrSize_t *));
 	unsigned int i;