[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    =?utf-8?q?=5Bkwebkitpart=5D_src=3A_Check_for_NULL_before_using_p?=
From:       Dawit Alemayehu <adawit () kde ! org>
Date:       2011-02-01 0:02:39
Message-ID: 20110201000239.671ABA60B0 () git ! kde ! org
[Download RAW message or body]

Git commit 46fa80220db9b59ff710e7c3f4501ec2ee7b1f7f by Dawit Alemayehu.
Pushed by adawit into branch 'master'.

Check for NULL before using pointer

M  +6    -3    src/kwebkitpart_ext.cpp     

http://commits.kde.org/kwebkitpart/46fa80220db9b59ff710e7c3f4501ec2ee7b1f7f

diff --git a/src/kwebkitpart_ext.cpp b/src/kwebkitpart_ext.cpp
index 9f352a4..a2ef530 100644
--- a/src/kwebkitpart_ext.cpp
+++ b/src/kwebkitpart_ext.cpp
@@ -333,10 +333,13 @@ void WebKitBrowserExtension::slotBlockIFrame()
         return;
 
     bool ok = false;
+
+    const QWebFrame* frame = view()->contextMenuResult().frame();
+    const QString urlStr = frame ? frame->url().toString() : QString();
+
     const QString url = KInputDialog::getText(i18n("Add URL to Filter"),
                                               i18n("Enter the URL:"),
-                                              view()->contextMenuResult().frame()->url().toString(),
-                                              &ok);
+                                              urlStr, &ok);
     if (ok) {
         WebKitSettings::self()->addAdFilter(url);
         reparseConfiguration();
@@ -353,7 +356,7 @@ void WebKitBrowserExtension::slotSendImage()
 {
     if (!view())
         return;
-    
+
     QStringList urls;
     urls.append(view()->contextMenuResult().imageUrl().path());
     const QString subject = view()->contextMenuResult().imageUrl().path();


[prev in list] [next in list] [prev in thread] [next in thread]