diff options
| author | Filipp Gunbin <fgunbin@fastmail.fm> | 2016-10-26 14:31:12 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2016-10-26 14:31:12 -0400 |
| commit | 4e45b55a9566189af6e40449954504ea7c47fa90 (patch) | |
| tree | 79a6e472f68ec320cc0128eb15ec42e78eb58cbb /lisp/shell.el | |
| parent | 5edf76ba15fb012e9cb3112ee4a2c9ef4b02f20e (diff) | |
| download | emacs-4e45b55a9566189af6e40449954504ea7c47fa90.tar.gz | |
* lisp/shell.el (shell--unquote&requote-argument): Match data misuse
* lisp/shell.el (shell--unquote&requote-argument): Fix
off-by-one thinko. Don't use match data after a failed string-match.
Diffstat (limited to 'lisp/shell.el')
| -rw-r--r-- | lisp/shell.el | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lisp/shell.el b/lisp/shell.el index 1f019f20f3a..34bd77282ab 100644 --- a/lisp/shell.el +++ b/lisp/shell.el @@ -384,11 +384,15 @@ Thus, this does not include the shell's current directory.") ((eq (aref qstr match) ?\") (setq dquotes (not dquotes))) ((eq (aref qstr match) ?\') (cond + ;; Treat single quote as text if inside double quotes. (dquotes (funcall push "'" (match-end 0))) - ((< match (1+ (length qstr))) + ((< (1+ match) (length qstr)) (let ((end (string-match "'" qstr (1+ match)))) - (funcall push (substring qstr (1+ match) end) - (or end (length qstr))))) + (unless end + (setq end (length qstr)) + (set-match-data (list match (length qstr)))) + (funcall push (substring qstr (1+ match) end) end))) + ;; Ignore if at the end of string. (t nil))) (t (error "Unexpected case in shell--unquote&requote-argument!"))) (setq qpos (match-end 0))) |