[Xfce4-commits] <midori:master> Bail out Autocompleter/ ViewCompletion on unset URI/ title

[Christian Dywan]

Updating branch refs/heads/master
         to 796719122af0fd49b9ba81ad610a2e52a56490d2 (commit)
       from 22c5c907858596ade005c3bc6f0f4679495a91b0 (commit)

commit 796719122af0fd49b9ba81ad610a2e52a56490d2
Author: Christian Dywan <christian at twotoasts.de>
Date:   Fri Mar 1 00:15:04 2013 +0100

    Bail out Autocompleter/ ViewCompletion on unset URI/ title
    
    See: https://bugs.launchpad.net/midori/+bug/1094856

 midori/midori-completion.vala     |    8 ++++++++
 midori/midori-viewcompletion.vala |   10 +++++++++-
 2 files changed, 17 insertions(+), 1 deletions(-)

diff --git a/midori/midori-completion.vala b/midori/midori-completion.vala
index e094de2..02b74c6 100644
--- a/midori/midori-completion.vala
+++ b/midori/midori-completion.vala
@@ -98,6 +98,14 @@ namespace Midori {
 
             int count = 1;
             foreach (var suggestion in suggestions) {
+                if (suggestion.uri == null) {
+                    warning ("suggestion.uri != null");
+                    continue;
+                }
+                if (suggestion.markup == null) {
+                    warning ("suggestion.markup != null");
+                    continue;
+                }
                 model.insert_with_values (null, completion.position + count,
                     Columns.URI, suggestion.uri,
                     Columns.MARKUP, suggestion.use_markup
diff --git a/midori/midori-viewcompletion.vala b/midori/midori-viewcompletion.vala
index b8eef6b..f416c3e 100644
--- a/midori/midori-viewcompletion.vala
+++ b/midori/midori-viewcompletion.vala
@@ -50,9 +50,17 @@ namespace Midori {
                 unowned List<GLib.Object> items_list = Katze.array_peek_items (items);
 
                 foreach (var item in items_list) {
-                    string uri, title;
+                    string? uri, title;
                     item.get ("uri", out uri);
                     item.get ("name", out title);
+                    if (uri == null) {
+                        warning ("item.uri != null");
+                        continue;
+                    }
+                    if (title == null) {
+                        warning ("item.name != null");
+                        continue;
+                    }
                     if (!(key in uri.casefold () || key in title.casefold ()))
                         continue;