- Fix occasional crash on LinuxPPC. Patch from Franz Sirl

[openssh.git] / scp.c

diff --git a/scp.c b/scp.c
index 7a2f0423a1a2300b63e2a756dcae5a13dddeb46e..1051d0d38de77c85f6bf2bc2238f2e36d1bbcae5 100644 (file)
--- a/scp.c
+++ b/scp.c
@@ -922,22 +922,24 @@ run_err(const char *fmt,...)
 {
        static FILE *fp;
        va_list ap;
-       va_start(ap, fmt);
 
        ++errs;
        if (fp == NULL && !(fp = fdopen(remout, "w")))
                return;
        (void) fprintf(fp, "%c", 0x01);
        (void) fprintf(fp, "scp: ");
+       va_start(ap, fmt);
        (void) vfprintf(fp, fmt, ap);
+       va_end(ap);
        (void) fprintf(fp, "\n");
        (void) fflush(fp);
 
        if (!iamremote) {
+               va_start(ap, fmt);
                vfprintf(stderr, fmt, ap);
+               va_end(ap);
                fprintf(stderr, "\n");
        }
-       va_end(ap);
 }
 
 /* Stuff below is from BSD rcp util.c. */