From: Po Lu <luangruo@yahoo.com>
Date: Fri, 12 Nov 2021 03:19:30 +0000 (+0800)
Subject: Fix potential NULL dereference in xwidget-webkit-uri
X-Git-Tag: emacs-29.0.90~3668^2~31
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=df2438d3695e065d4037e1c26a0c769c373f914c;p=emacs.git

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.
---

diff --git a/src/xwidget.c b/src/xwidget.c
index 7d5c49233c9..4d0bc44a153 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