Changeset 3129 for trunk/packages/vizservers/vtkvis

Timestamp:

Aug 1, 2012, 1:52:40 PM (12 years ago)

Author:

ldelgass

Message:

add null pointer sanity checks

File:

• trunk/packages/vizservers/vtkvis/RpVtkGraphicsObject.cpp (modified) (3 diffs)

trunk/packages/vizservers/vtkvis/RpVtkGraphicsObject.cpp

@@ -18 +18 @@
         _dataSet = dataSet;
 
-        if (renderer->getUseCumulativeRange()) {
+        if (renderer != NULL &&
+            dataSet != NULL &&
+            renderer->getUseCumulativeRange()) {
             renderer->getCumulativeDataRange(_dataRange,
                                              _dataSet->getActiveScalarsName(),
                                              1);
-        } else {
+        } else if (_dataSet != NULL) {
             _dataSet->getScalarRange(_dataRange);
         }
@@ -36 +38 @@
         return;
     }
+    if (renderer == NULL) {
+        ERROR("NULL renderer");
+        return;
+    }
 
     if (renderer->getUseCumulativeRange()) {
@@ -41 +47 @@
                                          _dataSet->getActiveScalarsName(),
                                          1);
-    } else  {
+    } else {
         _dataSet->getScalarRange(_dataRange);
     }