[Xfce4-commits] <midori:master> Return original URI if unescaping failed

[Christian Dywan]

Updating branch refs/heads/master
         to 243f93b70d61e0e35a8d6d60257cff1e6e06f8e1 (commit)
       from 4bfbe5b30e481d1bb464f5eae5051284664a951b (commit)

commit 243f93b70d61e0e35a8d6d60257cff1e6e06f8e1
Author: Alexander Butenko <a.butenka at gmail.com>
Date:   Wed Jun 1 18:21:51 2011 -0400

    Return original URI if unescaping failed
    
    The issue could be seen in the form of error messages:
    
    g_regex_replace_eval: assertion `string != NULL' failed

 midori/sokoke.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/midori/sokoke.c b/midori/sokoke.c
index 4df529a..eacd455 100644
--- a/midori/sokoke.c
+++ b/midori/sokoke.c
@@ -926,6 +926,8 @@ sokoke_uri_unescape_string (const gchar* uri)
     {
         /* Preserve %20 for pasting URLs into other windows */
         gchar* unescaped = g_uri_unescape_string (uri, "+");
+        if (!unescaped)
+            return g_strdup (uri);
         gchar* spaced = sokoke_replace_variables (unescaped, " ", "%20", NULL);
         g_free (unescaped);
         return spaced;