Changeset 5304 for nanovis/branches/1.2

Timestamp:

Apr 24, 2015 4:34:34 PM (6 years ago)

Author:

ldelgass

Message:

merge r5302:5303 from trunk

Location:

nanovis/branches/1.2

Files:

• . (modified) (1 prop)
• Command.cpp (modified) (3 diffs)

nanovis/branches/1.2/Command.cpp

@@ -1298 +1298 @@
     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) {
@@ -1333 +1340 @@
     } else if ((nBytes > 14) && (strncmp(bytes, "# vtk DataFile", 14) == 0)) {
         TRACE("VTK loading...");
-        if (nBytes <= 0) {
-            ERROR("data buffer is empty");
-            abort();
-        }
         std::stringstream fdata;
         fdata.write(bytes, nBytes);
@@ -1354 +1357 @@
         }
         TRACE("DX loading...");
-        if (nBytes <= 0) {
-            ERROR("data buffer is empty");
-            abort();
-        }
         std::stringstream fdata;
         fdata.write(bytes, nBytes);