Prevent infinite recursion in exit_cleanup(). Patch from Sviatoslav Sviridov.

diff --git a/NEWS b/NEWS
index f44216c..0717163 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -55,6 +55,9 @@ rsync changes since last release
     * Fixed bug in --copy-unsafe-links that caused it to be completely
       broken.  (Dave Dykstra)
 
+    * Prevent infinite recursion in cleanup code under certain circumstances.
+      (Sviatoslav Sviridov)
+
   INTERNAL:
 
     * Many code cleanups and improved internal documentation.  (Martin 

diff --git a/cleanup.c b/cleanup.c
index 37e074a..b9e9dab 100644 (file)
--- a/cleanup.c
+++ b/cleanup.c
@@ -61,6 +61,13 @@ void _exit_cleanup(int code, const char *file, int line)
        int ocode = code;
        extern int keep_partial;
        extern int log_got_error;
+       static int inside_cleanup = 0;
+
+       if (inside_cleanup != 0) {
+               /* prevent the occasional infinite recursion */
+               return;
+       }
+       inside_cleanup = 1;
 
        signal(SIGUSR1, SIG_IGN);
        signal(SIGUSR2, SIG_IGN);