Changeset 4880 for nanovis/trunk

Timestamp:

Dec 19, 2014 3:43:54 PM (9 years ago)

Author:

ldelgass

Message:

Fix leak in sendDataToClient method (when USE_THREADS is enabled)

Location:

nanovis/trunk

Files:

• Command.cpp (modified) (2 diffs)
• FlowCmd.cpp (modified) (3 diffs)
• nanovisServer.cpp (modified) (1 diff)

nanovis/trunk/Command.cpp

@@ -1363 +1363 @@
 
         char info[1024];
-        int cmdLength = 
+        int cmdLength =
             sprintf(info, "nv>data tag %s min %g max %g vmin %g vmax %g\n", tag, 
                     volume->wAxis.min(), volume->wAxis.max(),
@@ -2345 +2345 @@
 nv::initTcl(Tcl_Interp *interp, ClientData clientData)
 {
-    /*
-     * Ideally the connection is authenticated by nanoscale.  I still like the
-     * idea of creating a non-safe master interpreter with a safe slave
-     * interpreter.  Alias all the nanovis commands in the slave. That way we
-     * can still run Tcl code within nanovis.  The eventual goal is to create
-     * a test harness through the interpreter for nanovis.
-     */
-
     Tcl_MakeSafe(interp);
 

nanovis/trunk/FlowCmd.cpp

@@ -1139 +1139 @@
 #endif
     TRACE("Enter: %s", cmd);
-    FILE *f;
-    f = popen(cmd, "r");
+    FILE *f = popen(cmd, "r");
     if (f == NULL) {
         Tcl_AppendResult(interp, "can't run ffmpeg: ", 
@@ -1149 +1148 @@
     size_t total = 0;
     for (;;) {
-        ssize_t numRead;
         char buffer[BUFSIZ]; 
         
-        numRead = fread(buffer, sizeof(char), BUFSIZ, f);
+        ssize_t numRead = fread(buffer, sizeof(char), BUFSIZ, f);
         total += numRead;
         if (numRead == 0) {             // EOF
@@ -1180 +1178 @@
     sprintf(cmd,"nv>image -type movie -token \"%s\" -bytes %lu\n", 
             token, total);
-    // Memory is freed by this call
+    // Memory for data payload is freed by this call
     nv::sendDataToClient(cmd, data, total);
     return TCL_OK;

nanovis/trunk/nanovisServer.cpp

@@ -311 +311 @@
     }
     delete [] iov;
+#endif
     free(data);
-#endif
 }