bug#58718: Acknowledgement (Incorrect regex in nXML URI check)

[Martin Jerabek <om@mailservice.ms>]

[-- Attachment #1: Type: text/plain, Size: 859 bytes --]

It turned out that my patch was incomplete. Fixing the bug in
rng-uri-file-name-1 revealed another bug in rng-uri-unescape-unibyte.
The anonymous function passed to replace-regexp-in-string returned a
number (e.g. 32 for space) but replace-regexp-in-string expected a
string as the return value.

I therefore added a call to "string" to convert the number back to a
string (e.g. " ").

With this fix I was finally able to use a RELAX-NG schema file in a
path containing spaces.

I made the same fix in rng-uri-unescape-unibyte-match because it was
also obviously wrong (regexp-quote expects a string). However,
it would be good if someone more familiar with this code (and Lisp in
general) could check all the other occurrences of
replace-regexp-in-string to make sure they do not contain the same bug.

Find attached the expanded patch.


[-- Attachment #2: rng-uri.patch --]
[-- Type: text/x-patch, Size: 1188 bytes --]

diff --git a/lisp/nxml/rng-uri.el b/lisp/nxml/rng-uri.el
index 77fed8c32d..242238e0d1 100644
--- a/lisp/nxml/rng-uri.el
+++ b/lisp/nxml/rng-uri.el
@@ -68,7 +68,7 @@ Signal an error if URI is not a valid file URL."
 
 ;; pattern is either nil or match or replace
 (defun rng-uri-file-name-1 (uri pattern)
-  (unless (string-match "\\`\\(?:[^%]\\|%[[:xdigit:]]{2}\\)*\\'" uri)
+  (unless (string-match "\\`\\(?:[^%]\\|%[[:xdigit:]]\\{2\\}\\)*\\'" uri)
     (rng-uri-error "Bad escapes in URI `%s'" uri))
   (setq uri (rng-uri-unescape-multibyte uri))
   (let* ((components
@@ -312,7 +312,7 @@ Both FULL and BASE must be absolute URIs."
 (defun rng-uri-unescape-unibyte (str)
   (replace-regexp-in-string "%[0-7][[:xdigit:]]"
 			    (lambda (h)
-			      (string-to-number (substring h 1) 16))
+			      (string (string-to-number (substring h 1) 16)))
 			    str
 			    t
 			    t))
@@ -325,8 +325,8 @@ Both FULL and BASE must be absolute URIs."
 				(regexp-quote
 				 (if (= (length match) 1)
 				     match
-				   (string-to-number (substring match 1)
-						     16)))))
+				   (string (string-to-number (substring match 1)
+						     16))))))
 			    str
 			    t
 			    t))