Fix-up error message buffer allocation

hageboeck · Jul 3, 2020 · 4229268 · 4229268
1 parent 2c46921
commit 4229268
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/core/base/src/TError.cxx b/core/base/src/TError.cxx
@@ -130,7 +130,7 @@ void ErrorHandler(Int_t level, const char *location, const char *fmt, std::va_li
       buf_size = n + 1;
       if (buf != &(small_buf[0]))
          delete[] buf;
-      buf = new char[buf_size];
+      buf_storage = buf = new char[buf_size];
 
       // Try again with a sufficiently large buffer
       va_copy(ap_copy, ap);

diff --git a/core/base/test/TErrorTests.cxx b/core/base/test/TErrorTests.cxx
@@ -50,4 +50,8 @@ TEST(TError, LongMessage) {
 
    Info("location", "%s", longMessage.c_str());
    EXPECT_EQ(longMessage, gTestLastMsg);
+
+   // Again, should reuse the now enlarged, thread-local heap-allocated buffer
+   Info("location", "%s", longMessage.c_str());
+   EXPECT_EQ(longMessage, gTestLastMsg);
 }