Fix zlib CVE-2016-9840.

[rsync.git] / testrun.c

diff --git a/testrun.c b/testrun.c
index 46c59e898d50c8a2b58bfc2e4f6509ed609aa1f3..049e3ebf0a51c346a57aaaaa8175900eb68f386c 100644 (file)
--- a/testrun.c
+++ b/testrun.c
@@ -2,18 +2,25 @@
 
 #include "rsync.h"
 
-#define MAX_TEST_SECONDS (5*60)
+#define DEFAULT_TIMEOUT_SECS (5*60)
+#define TIMEOUT_ENV "TESTRUN_TIMEOUT"
 
  int main(int argc, char *argv[])
 {
        pid_t pid;
-       int status, slept = 0;
+       char *timeout_env;
+       int status, timeout_secs, slept = 0;
 
        if (argc < 2) {
                fprintf(stderr, "Usage: testrun [SHELL_OPTIONS] TESTSUITE_SCRIPT [ARGS]\n");
                exit(1);
        }
 
+       if ((timeout_env = getenv(TIMEOUT_ENV)) != NULL)
+               timeout_secs = atoi(timeout_env);
+       else
+               timeout_secs = DEFAULT_TIMEOUT_SECS;
+
        if ((pid = fork()) < 0) {
                fprintf(stderr, "TESTRUN ERROR: fork failed: %s\n", strerror(errno));
                exit(1);
@@ -36,12 +43,12 @@
                        fprintf(stderr, "TESTRUN ERROR: waitpid failed: %s\n", strerror(errno));
                        exit(1);
                }
-               if (slept++ > MAX_TEST_SECONDS) {
-                       fprintf(stderr, "TESTRUN TIMEOUT: test took over %d seconds.\n", MAX_TEST_SECONDS);
+               if (slept++ > timeout_secs) {
+                       fprintf(stderr, "TESTRUN TIMEOUT: test took over %d seconds.\n", timeout_secs);
                        if (kill(pid, SIGTERM) < 0)
-                               fprintf(stderr, "TESTRUN ERROR: failed to kill pid %ld: %s\n", (long)pid, strerror(errno));
+                               fprintf(stderr, "TESTRUN ERROR: failed to kill pid %d: %s\n", (int)pid, strerror(errno));
                        else
-                               fprintf(stderr, "TESTRUN INFO: killed pid %ld\n", (long)pid);
+                               fprintf(stderr, "TESTRUN INFO: killed pid %d\n", (int)pid);
                        exit(1);
                }
                sleep(1);