commit 2d40ec4e9a3fb3540756fa45a6cffd541ada2c78
author robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Feb 07 20:39:40 2013 +0000
committer robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Feb 07 20:39:40 2013 +0000
tree 9a20d3ddfbe492435713d3a413c3b39c4e5fea10
parent 53009ba7019cbe86a6ab2aa5b7ae5893e4efffbd

Cleanup debugger's handling of bad input files

https://codereview.appspot.com/7308062/



git-svn-id: http://skia.googlecode.com/svn/trunk@7654 2bbb7eff-a529-9590-31e7-b0007b416f81

debugger/QT/SkDebuggerGUI.cpp

diff --git a/debugger/QT/SkDebuggerGUI.cpp b/debugger/QT/SkDebuggerGUI.cpp
index 890c607..a823c19 100644
--- a/debugger/QT/SkDebuggerGUI.cpp
+++ b/debugger/QT/SkDebuggerGUI.cpp
@@ -1001,7 +1001,16 @@
     fFileName = fileName;
     fLoading = true;
     SkStream* stream = SkNEW_ARGS(SkFILEStream, (fileName.c_str()));
-    SkOffsetPicture* picture = SkNEW_ARGS(SkOffsetPicture, (stream, NULL, &SkImageDecoder::DecodeStream));
+
+    bool success = false;
+
+    SkOffsetPicture* picture = SkNEW_ARGS(SkOffsetPicture, (stream, &success, &SkImageDecoder::DecodeStream));
+
+    if (!success) {
+        QMessageBox::critical(this, "Error loading file", "Couldn't read file, sorry.");
+        SkSafeUnref(stream);
+        return;
+    }
 
     fCanvasWidget.resetWidgetTransform();
     fDebugger.loadPicture(picture);