master df2438d: Fix potential NULL dereference in xwidget-webkit-uri

[Po Lu]

branch: master
commit df2438d3695e065d4037e1c26a0c769c373f914c
Author: Po Lu <luangruo@yahoo.com>
Commit: Po Lu <luangruo@yahoo.com>

    Fix potential NULL dereference in xwidget-webkit-uri
    
    * src/xwidget.c (Fxwidget_webkit_uri): Don't assume
    webkit_web_view_get_uri will always return a valid string.
---
 src/xwidget.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/xwidget.c b/src/xwidget.c
index 7d5c492..4d0bc44 100644
--- a/src/xwidget.c
+++ b/src/xwidget.c
@@ -1725,7 +1725,10 @@ DEFUN ("xwidget-webkit-uri",
   WEBKIT_FN_INIT ();
 #ifdef USE_GTK
   WebKitWebView *wkwv = WEBKIT_WEB_VIEW (xw->widget_osr);
-  return build_string (webkit_web_view_get_uri (wkwv));
+  const gchar *uri = webkit_web_view_get_uri (wkwv);
+  if (!uri)
+    return build_string ("");
+  return build_string (uri);
 #elif defined NS_IMPL_COCOA
   return nsxwidget_webkit_uri (xw);
 #endif