bug#10489: 24.0.92; dired-do-copy may create infinite directory hierarchy

[Thierry Volpiatto <thierry.volpiatto@gmail.com>]

[-- Attachment #1.1: Type: text/plain, Size: 905 bytes --]

Hi, here a patch tha should fix this.
I resent it because I am not sure precedent post have been sent.

Michael Heerdegen <michael_heerdegen@web.de> writes:

> Hello,
>
> start emacs -Q.
>
> Suppose you have a directory "~/Test".  Do C-x d ~ RET.  Jump to the
> line showing "Test".  Hit C and enter "~/Test".  Answer "yes" to the
>
>  Recursive copies of /home/micha/Test? (yes or no) 
>
> question.
>
> This creates an huge recursive hierarchy of "Test" directories
>
>   ~/Test/Test/Test/Test/Test/Test/Test/Test/Test/Test/Test/Test/...
>
> The error
>
>   copy-directory: Variable binding depth exceeds max-specpdl-size
>
> finally stops that.
>
> The user may do something like that per accident.  Emacs should IMHO not
> behave like that.
>
> The problem also appears in Emacs 23.

-- 
  Thierry
Get my Gnupg key:
gpg --keyserver pgp.mit.edu --recv-keys 59F29997 

[-- Attachment #1.2: patch-r118414 --]
[-- Type: application/octet-stream, Size: 2107 bytes --]

# HG changeset patch
# User Thierry Volpiatto <thierry.volpiatto@gmail.com>
# Date 1326402527 -3600
# Node ID 0b39841e4c22aa2e241f185136c8fcec5d9acf18
# Parent  402d62612daf76522194f2a8d02463cbbd64626e
Fix error when trying to copy directory on itself (bug#10489).
* lisp/dired-aux.el (dired-copy-file-recursive): Error when trying to copy file or dir on itself.
(dired-create-file): Be sure destination is set when from and to are the same file/dir.
* lisp/files.el (copy-directory): Error when trying to copy file or dir on itself.

diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -1264,6 +1264,9 @@
 
 (defun dired-copy-file-recursive (from to ok-flag &optional
 				       preserve-time top recursive)
+  (when (string= (file-name-as-directory from)
+                 (file-name-as-directory to))
+    (error "Can't copy to same directory"))
   (let ((attrs (file-attributes from)))
     (if (and recursive
 	     (eq t (car attrs))
@@ -1431,7 +1434,10 @@
                          (marker-char (dired-file-marker from)) ; slow
                          (t nil))))
 	    (when (and (file-directory-p from)
-		       (file-directory-p to)
+		       (or (file-directory-p to)
+                           (string= (file-name-as-directory from)
+                                    (file-name-as-directory
+                                     (file-name-directory to))))
 		       (eq file-creator 'dired-copy-file))
 	      (setq to (file-name-directory to)))
             (condition-case err
diff --git a/lisp/files.el b/lisp/files.el
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -4928,6 +4928,9 @@
 	    (format "Copy directory %s to: " dir)
 	    default-directory default-directory nil nil)
 	   current-prefix-arg t nil)))
+  (when (string= (file-name-as-directory directory)
+                 (file-name-as-directory newname))
+    (error "Can't copy to same directory"))
   ;; If default-directory is a remote directory, make sure we find its
   ;; copy-directory handler.
   (let ((handler (or (find-file-name-handler directory 'copy-directory)

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]