Adding a new class LastExceptionBuffer for the purpose of owning the memory for the last exception C string. This replaces s_debugLastException.

1 files changed, 37 insertions, 12 deletions

diff --git a/src/base/exception.cpp b/src/base/exception.cpp
index 87bdfcfa5..e1486e5bc 100644
--- a/src/base/exception.cpp
+++ b/src/base/exception.cpp
@@ -16,10 +16,11 @@
 
 #include "base/exception.h"
 
-#include <string>
+#include <cstdarg>
 #include <cstdio>
 #include <cstdlib>
-#include <cstdarg>
+#include <cstring>
+#include <string>
 
 #include "base/cvc4_assert.h"
 
@@ -27,6 +28,28 @@ using namespace std;
 
 namespace CVC4 {
 
+CVC4_THREADLOCAL(LastExceptionBuffer*) LastExceptionBuffer::s_currentBuffer = NULL;
+
+LastExceptionBuffer::LastExceptionBuffer() : d_contents(NULL) {}
+
+LastExceptionBuffer::~LastExceptionBuffer() {
+  if(d_contents != NULL){
+    free(d_contents);
+    d_contents = NULL;
+  }
+}
+
+void LastExceptionBuffer::setContents(const char* string) {
+  if(d_contents != NULL){
+    free(d_contents);
+    d_contents = NULL;
+  }
+
+  if(string != NULL){
+    d_contents = strdup(string);
+  }
+}
+
 char* IllegalArgumentException::s_header = "Illegal argument detected";
 
 std::string IllegalArgumentException::formatVariadic() {
@@ -107,13 +130,14 @@ void IllegalArgumentException::construct(const char* header, const char* extra,
   setMessage(string(buf));
 
 #ifdef CVC4_DEBUG
-  if(s_debugLastException == NULL) {
-    // we leak buf[] but only in debug mode with assertions failing
-    s_debugLastException = buf;
+  LastExceptionBuffer* buffer = LastExceptionBuffer::getCurrent();
+  if(buffer != NULL){
+    if(buffer->getContents() == NULL) {
+      buffer->setContents(buf);
+    }
   }
-#else /* CVC4_DEBUG */
-  delete [] buf;
 #endif /* CVC4_DEBUG */
+  delete [] buf;
 }
 
 void IllegalArgumentException::construct(const char* header, const char* extra,
@@ -147,13 +171,14 @@ void IllegalArgumentException::construct(const char* header, const char* extra,
   setMessage(string(buf));
 
 #ifdef CVC4_DEBUG
-  if(s_debugLastException == NULL) {
-    // we leak buf[] but only in debug mode with assertions failing
-    s_debugLastException = buf;
+  LastExceptionBuffer* buffer = LastExceptionBuffer::getCurrent();
+  if(buffer != NULL){
+    if(buffer->getContents() == NULL) {
+      buffer->setContents(buf);
+    }
   }
-#else /* CVC4_DEBUG */
-  delete [] buf;
 #endif /* CVC4_DEBUG */
+  delete [] buf;
 }
 
 } /* namespace CVC4 */