summaryrefslogtreecommitdiff
path: root/src/xwidget.c
diff options
context:
space:
mode:
authorPo Lu <luangruo@yahoo.com>2021-11-12 11:19:30 +0800
committerPo Lu <luangruo@yahoo.com>2021-11-12 11:19:30 +0800
commitdf2438d3695e065d4037e1c26a0c769c373f914c (patch)
treea7e0f13e20963ebffa23ce6e0c95889586c4f4aa /src/xwidget.c
parent372824a8bf303421eaeff5b1cb8c289a3efa86b3 (diff)
downloademacs-df2438d3695e065d4037e1c26a0c769c373f914c.tar.gz
emacs-df2438d3695e065d4037e1c26a0c769c373f914c.tar.bz2
emacs-df2438d3695e065d4037e1c26a0c769c373f914c.zip
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.
Diffstat (limited to 'src/xwidget.c')
-rw-r--r--src/xwidget.c5
1 files changed, 4 insertions, 1 deletions
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