From: Lars Ingebrigtsen Date: Thu, 20 Feb 2020 14:14:39 +0000 (+0100) Subject: Fix problem with degenerate specs in shr X-Git-Tag: emacs-28.0.90~7862 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3ac834951786a73995c1fc9748395e9866f98f30;p=emacs.git Fix problem with degenerate specs in shr * lisp/url/url-expand.el (url-expand-file-name): Don't bug out on degenerate base/expander pairs (bug#39235). --- diff --git a/lisp/url/url-expand.el b/lisp/url/url-expand.el index 47964b081f4..f34ef810c4a 100644 --- a/lisp/url/url-expand.el +++ b/lisp/url/url-expand.el @@ -92,12 +92,19 @@ path components followed by `..' are removed, along with the `..' itself." (cond ((= (length url) 0) ; nil or empty string (url-recreate-url default)) - ((string-match url-nonrelative-link url) ; Fully-qualified URL, return it immediately + ((string-match url-nonrelative-link url) ; Fully-qualified URL, + ; return it immediately url) (t (let* ((urlobj (url-generic-parse-url url)) (inhibit-file-name-handlers t) - (expander (url-scheme-get-property (url-type default) 'expand-file-name))) + (expander (if (url-type default) + (url-scheme-get-property (url-type default) + 'expand-file-name) + ;; If neither the default nor the URL to be + ;; expanded have a protocol, then just use the + ;; identity expander as a fallback. + 'url-identity-expander))) (if (string-match "^//" url) (setq urlobj (url-generic-parse-url (concat (url-type default) ":" url))))