Ensure that node pointer is valid before traversing.

haiku · Dec 12, 2012 · 9403439 · 9403439
1 parent 8f06ba2
commit 9403439
Showing 1 changed file with 14 additions and 12 deletions.
diff --git a/src/apps/debugger/user_interface/util/UiUtils.cpp b/src/apps/debugger/user_interface/util/UiUtils.cpp
@@ -197,8 +197,6 @@ UiUtils::PrintValueNodeGraph(BString& _output, StackFrame* frame,
 		return;
 	}
 
-	_output << " {\n";
-
 	if (node->CountChildren() == 1
 		&& node->GetType()->Kind() == TYPE_ADDRESS
 		&& node->ChildAt(0)->GetType()->Kind() == TYPE_COMPOUND) {
@@ -208,18 +206,22 @@ UiUtils::PrintValueNodeGraph(BString& _output, StackFrame* frame,
 		node = node->ChildAt(0)->Node();
 	}
 
-	for (int32 i = 0; i < node->CountChildren(); i++) {
-		// don't dump compound nodes if our depth limit won't allow
-		// us to traverse into their children anyways, and the top
-		// level node contains no data of intereest.
-		if (node->ChildAt(i)->GetType()->Kind() != TYPE_COMPOUND
-			|| maxDepth > 1) {
-			PrintValueNodeGraph(_output, frame, node->ChildAt(i),
-				indentLevel + 1, maxDepth - 1);
+	if (node != NULL) {
+		_output << " {\n";
+
+		for (int32 i = 0; i < node->CountChildren(); i++) {
+			// don't dump compound nodes if our depth limit won't allow
+			// us to traverse into their children anyways, and the top
+			// level node contains no data of intereest.
+			if (node->ChildAt(i)->GetType()->Kind() != TYPE_COMPOUND
+				|| maxDepth > 1) {
+				PrintValueNodeGraph(_output, frame, node->ChildAt(i),
+					indentLevel + 1, maxDepth - 1);
+			}
 		}
+		_output.Append('\t', indentLevel);
+		_output << "}\n";
 	}
-	_output.Append('\t', indentLevel);
-	_output << "}\n";
 
 	return;
 }