Changeset 5302 for nanovis

Timestamp:

Apr 24, 2015, 4:28:43 PM (9 years ago)

Author:

ldelgass

Message:

Don't abort on bad number of bytes, just return an error

Location:

nanovis/trunk

Files:

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

nanovis/trunk/Command.cpp

@@ -1281 +1281 @@
     const char *tag = Tcl_GetString(objv[4]);
 
+    if (nbytes <= 0) {
+        Tcl_AppendResult(interp, "bad # bytes request \"", 
+                         Tcl_GetString(objv[3]), "\" for \"data follows\"", (char *)NULL);
+        ERROR("Bad nbytes %d", nBytes);
+        return TCL_ERROR;
+    }
+
     Rappture::Buffer buf(nbytes);
     if (GetDataStream(interp, buf, nbytes) != TCL_OK) {
@@ -1311 +1318 @@
     } else if ((nBytes > 14) && (strncmp(bytes, "# vtk DataFile", 14) == 0)) {
         TRACE("VTK loading...");
-        if (nBytes <= 0) {
-            ERROR("data buffer is empty");
-            abort();
-        }
 #ifdef USE_VTK
         volume = load_vtk_volume_stream(tag, bytes, nBytes);
@@ -1337 +1340 @@
         }
         TRACE("DX loading...");
-        if (nBytes <= 0) {
-            ERROR("data buffer is empty");
-            abort();
-        }
         std::stringstream fdata;
         fdata.write(bytes, nBytes);

nanovis/trunk/FlowCmd.cpp

@@ -210 +210 @@
     } else if ((length > 14) && (strncmp(bytes, "# vtk DataFile", 14) == 0)) {
         TRACE("VTK loading...");
-        if (length <= 0) {
-            ERROR("data buffer is empty");
-            abort();
-        }
 #ifdef USE_VTK
         volume = load_vtk_volume_stream(flow->name(), bytes, length);