From d4c732d16a5a79293c6f205ba9c75f82b17b3aa8 Mon Sep 17 00:00:00 2001
Date: Wed, 5 Apr 2017 17:16:33 -0400
Subject: [PATCH] Check that file argument is a string
* lisp/vc/ediff-diff.el (ediff-exec-process): Check that the argument
passed to `file-local-copy' is a string (Bug#26378). Also convert
an existing comment for the function to its doc-string.
lisp/vc/ediff-diff.el | 24 +++++++++++++++++-------
1 file changed, 17 insertions(+), 7 deletions(-)
diff --git a/lisp/vc/ediff-diff.el b/lisp/vc/ediff-diff.el
index cfa08ef360..ca7c3ab517 100644
@@ -1134,12 +1134,21 @@ ediff-setup-diff-regions3
-;; Execute PROGRAM asynchronously, unless OS/2, Windows-*, or DOS, or unless
-;; SYNCH is non-nil. BUFFER must be a buffer object, and must be alive. The
-;; OPTIONS arg is a list of options to pass to PROGRAM. It may be a blank
-;; string. All elements in FILES must be strings. We also delete nil from
(defun ediff-exec-process (program buffer synch options &rest files)
+ "Execute the diff PROGRAM.
+The PROGRAM output is sent to BUFFER, which must be a buffer object,
+and must be alive.
+The PROGRAM is executed asynchronously unless the OS is OS/2,
+Windows-*, or DOS, or unless SYNCH is non-nil.
+OPTIONS is a list of options to pass to PROGRAM. It may be a blank
+An element in FILES must be either a string or nil.
+We also delete nil and \"\" from all arguments."
(let ((data (match-data))
;; If this is a buffer job, we are diffing temporary files
;; produced by Emacs with ediff-coding-system-for-write, so
@@ -1151,8 +1160,9 @@ ediff-exec-process
(setq args (append (split-string options)
(mapcar (lambda (file)
- (or (file-local-copy file) file)))
+ (when (stringp file)
+ (or (file-local-copy file) file))))
(setq args (delete "" (delq nil args))) ; delete nil and "" from arguments
;; the --binary option, if present, should be used only for buffer jobs