Stop potential crash by guarding the access to the page.

Based on the work from Shawn Krisman ([email protected]). http://code.google.com/p/phantomjs/issues/detail?id=719
thomasdingler · Sep 24, 2012 · 8ba3c52 · 8ba3c52
1 parent 63e06cb
commit 8ba3c52
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/phantom.cpp b/src/phantom.cpp
@@ -315,6 +315,9 @@ QObject* Phantom::createCallback()
 
 void Phantom::loadModule(const QString &moduleSource, const QString &filename)
 {
+    if (m_terminated)
+        return;
+
    QString scriptSource =
       "(function(require, exports, module) {" +
       moduleSource +
@@ -328,6 +331,9 @@ void Phantom::loadModule(const QString &moduleSource, const QString &filename)
 
 bool Phantom::injectJs(const QString &jsFilePath)
 {
+    if (m_terminated)
+        return false;
+
     return Utils::injectJsInFrame(jsFilePath, libraryPath(), m_page->mainFrame());
 }