fixes for typechecking to avoid crashes when some webkit functions are called with nil instead of valid webkit obj. intended to make it run on archlinux

2 files changed, 27 insertions, 8 deletions

diff --git a/lisp/xwidget.el b/lisp/xwidget.el
index 8ed0c72f296..a8fa84da37f 100644
--- a/lisp/xwidget.el
+++ b/lisp/xwidget.el
@@ -72,7 +72,9 @@ NEW-SESSION specifies whether to create a new xwidget-webkit session.  URL
 defaults to the string looking like a url around the cursor position."
   (interactive (progn
                  (require 'browse-url)
-                 (browse-url-interactive-arg "xwidget-webkit URL: " ( xwidget-webkit-current-url))))
+                 (browse-url-interactive-arg "xwidget-webkit URL: "
+                                             ;;( xwidget-webkit-current-url)
+                                             )))
   (when (stringp url)
     (setq url (url-tidy url))
     (if new-session
@@ -167,7 +169,8 @@ defaults to the string looking like a url around the cursor position."
             
             ((eq xwidget-event-type 'navigation-policy-decision-requested)
              (if (string-match ".*#\\(.*\\)" strarg)
-                 (xwidget-webkit-show-id-or-named-element xwidget (match-string 1 strarg))))))))
+                 (xwidget-webkit-show-id-or-named-element xwidget (match-string 1 strarg))))
+            (t (message "unhandled event:%s" xwidget-event-type))))))
 
 (define-derived-mode xwidget-webkit-mode
   special-mode "xwidget-webkit" "xwidget webkit view mode"
@@ -180,7 +183,7 @@ defaults to the string looking like a url around the cursor position."
 (defvar xwidget-webkit-last-session-buffer nil)
 
 (defun  xwidget-webkit-last-session ()
-  "Last active webkit, or a new one."
+  "Last active webkit, or nil."
   (if (buffer-live-p xwidget-webkit-last-session-buffer)
       (save-excursion
         (set-buffer xwidget-webkit-last-session-buffer)
@@ -348,7 +351,8 @@ Argument H height."
 (defun xwidget-webkit-current-url ()
   "Get the webkit url. place it on kill ring."
   (interactive)
-  (let ((url (kill-new   (xwidget-webkit-execute-script-rv (xwidget-webkit-current-session) "document.URL"))))
+  (let* ((rv (xwidget-webkit-execute-script-rv (xwidget-webkit-current-session) "document.URL"))
+         (url (kill-new   (if rv rv ""))))
     (message "url: %s" url )
     url))
 
diff --git a/src/xwidget.c b/src/xwidget.c
index 848e95fca1a..93d7c46a41f 100644
--- a/src/xwidget.c
+++ b/src/xwidget.c
@@ -826,22 +826,37 @@ x_draw_xwidget_glyph_string (struct glyph_string *s)
 
 
 #ifdef HAVE_WEBKIT_OSR
+
+//FUGLY macro that checks WEBKIT_IS_WEB_VIEW(xw->widget_osr) first 
+#define WEBKIT_FN_INIT()                        \
+  struct xwidget* xw;\  
+if(!XXWIDGETP(xwidget)) {printf("ERROR not an xwidget\n"); return Qnil;}; \
+if(Qnil == xwidget) {printf("ERROR xwidget nil\n");   return Qnil;};    \
+  xw = XXWIDGET(xwidget);                                                    \
+  if(NULL == xw) printf("ERROR xw is 0\n");                               \
+  if((NULL == xw->widget_osr) || !WEBKIT_IS_WEB_VIEW(xw->widget_osr)){  \
+    printf("ERROR xw->widget_osr does not hold a webkit instance\n");\
+    return Qnil;\
+  };
+
+
 DEFUN ("xwidget-webkit-goto-uri", Fxwidget_webkit_goto_uri,  Sxwidget_webkit_goto_uri, 2, 2, 0,
        doc:     /* webkit goto uri.*/
        )
   (Lisp_Object xwidget, Lisp_Object uri)
 {
-  struct xwidget* xw = XXWIDGET(xwidget);
+  WEBKIT_FN_INIT();
   webkit_web_view_load_uri ( WEBKIT_WEB_VIEW(xw->widget_osr), SDATA(uri));
   return Qnil;
 }
 
+
 DEFUN ("xwidget-webkit-execute-script", Fxwidget_webkit_execute_script,  Sxwidget_webkit_execute_script, 2, 2, 0,
        doc:     /* webkit exec js.*/
        )
   (Lisp_Object xwidget, Lisp_Object script)
 {
-  struct xwidget* xw = XXWIDGET(xwidget);
+  WEBKIT_FN_INIT();
   webkit_web_view_execute_script( WEBKIT_WEB_VIEW(xw->widget_osr), SDATA(script));
   return Qnil;
 }
@@ -852,7 +867,7 @@ DEFUN ("xwidget-webkit-get-title", Fxwidget_webkit_get_title,  Sxwidget_webkit_g
   (Lisp_Object xwidget)
 {
   //TODO support multibyte strings
-  struct xwidget* xw = XXWIDGET(xwidget);
+  WEBKIT_FN_INIT();
   const gchar* str=webkit_web_view_get_title( WEBKIT_WEB_VIEW(xw->widget_osr));
   //return make_string_from_bytes(str, wcslen((const wchar_t *)str), strlen(str));
   if(str == 0){
@@ -931,7 +946,7 @@ DEFUN ("xwidget-webkit-dom-dump", Fxwidget_webkit_dom_dump,  Sxwidget_webkit_dom
        )
   (Lisp_Object xwidget)
 {
-  struct xwidget* xw = XXWIDGET(xwidget);
+  WEBKIT_FN_INIT();
   xwidget_webkit_dom_dump(WEBKIT_DOM_NODE(webkit_web_view_get_dom_document( WEBKIT_WEB_VIEW(xw->widget_osr))));
   return Qnil;
 }