Changeset 4605 for vtkvis

Timestamp:

Aug 2, 2014 12:33:06 AM (9 years ago)

Author:

ldelgass

Message:

Merge crash fix from r4422 in trunk

Location:

vtkvis/branches/1.7

Files:

• . (modified) (1 prop)
• RendererCmd.cpp (modified) (2 diffs)
• Trace.cpp (modified) (1 diff)
• Trace.h (modified) (2 diffs)

vtkvis/branches/1.7/RendererCmd.cpp

@@ -12622 +12622 @@
             std::ostringstream oss;
             oss << "nv>viserror -type internal_error -token " << g_stats.nCommands << " -bytes " << nBytes << "\n" << string;
-            nBytes = oss.str().length();
+            std::string ostr = oss.str();
+            nBytes = ostr.length();
 
 #ifdef USE_THREADS
-            queueResponse(clientData, oss.str().c_str(), nBytes, Response::VOLATILE, Response::ERROR);
+            queueResponse(clientData, ostr.c_str(), nBytes, Response::VOLATILE, Response::ERROR);
 #else
-            if (write(fdOut, oss.str().c_str(), nBytes) < 0) {
+            if (write(fdOut, ostr.c_str(), nBytes) < 0) {
                 ERROR("write failed: %s", strerror(errno));
                 return -1;
@@ -12635 +12636 @@
     }
 
-    string = getUserMessages();
-    nBytes = strlen(string);
+    std::string msg = getUserMessages();
+    nBytes = msg.length();
     if (nBytes > 0) {
+        string = msg.c_str();
         TRACE("userError=(%s)", string);
 
         std::ostringstream oss;
         oss << "nv>viserror -type error -token " << g_stats.nCommands << " -bytes " << nBytes << "\n" << string;
-        nBytes = oss.str().length();
+        std::string ostr = oss.str();
+        nBytes = ostr.length();
 
 #ifdef USE_THREADS
-        queueResponse(clientData, oss.str().c_str(), nBytes, Response::VOLATILE, Response::ERROR);
+        queueResponse(clientData, ostr.c_str(), nBytes, Response::VOLATILE, Response::ERROR);
 #else
-        if (write(fdOut, oss.str().c_str(), nBytes) < 0) {
+        if (write(fdOut, ostr.c_str(), nBytes) < 0) {
             ERROR("write failed: %s", strerror(errno));
             return -1;

vtkvis/branches/1.7/Trace.cpp

@@ -88 +88 @@
 }
 
-const char *
+std::string
 VtkVis::getUserMessages()
 {
-    return g_UserErrorString.str().c_str();
+    return g_UserErrorString.str();
 }
 

vtkvis/branches/1.7/Trace.h

@@ -9 +9 @@
 #define VTKVIS_TRACE_H
 
+#include <string>
+
 #include <syslog.h>
 
@@ -15 +17 @@
 extern void logUserMessage(const char* format, ...);
 
-extern const char *getUserMessages();
+extern std::string getUserMessages();
 
 extern void clearUserMessages();