[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 3ac8349 1/2: Fix problem with degenerate <html base="."> specs in
|
From: |
Lars Ingebrigtsen |
|
Subject: |
master 3ac8349 1/2: Fix problem with degenerate <html base="."> specs in shr |
|
Date: |
Thu, 20 Feb 2020 09:15:17 -0500 (EST) |
branch: master
commit 3ac834951786a73995c1fc9748395e9866f98f30
Author: Lars Ingebrigtsen <address@hidden>
Commit: Lars Ingebrigtsen <address@hidden>
Fix problem with degenerate <html base="."> specs in shr
* lisp/url/url-expand.el (url-expand-file-name): Don't bug out on
degenerate base/expander pairs (bug#39235).
---
lisp/url/url-expand.el | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/lisp/url/url-expand.el b/lisp/url/url-expand.el
index 47964b0..f34ef81 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))))