New upstream release (7.3p1).

1 files changed, 5 insertions, 3 deletions

diff --git a/sshbuf-getput-basic.c b/sshbuf-getput-basic.c
index 23e0fd7c1..74c49be7c 100644
--- a/sshbuf-getput-basic.c
+++ b/sshbuf-getput-basic.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: sshbuf-getput-basic.c,v 1.5 2015/10/20 23:24:25 mmcc Exp $    */
+/*      $OpenBSD: sshbuf-getput-basic.c,v 1.6 2016/06/16 11:00:17 dtucker Exp $ */
 /*
  * Copyright (c) 2011 Damien Miller
  *
@@ -19,6 +19,8 @@
 #include "includes.h"
 
 #include <sys/types.h>
+
+#include <stdarg.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -268,7 +270,7 @@ sshbuf_putfv(struct sshbuf *buf, const char *fmt, va_list ap)
         int r, len;
         u_char *p;
 
-        va_copy(ap2, ap);
+        VA_COPY(ap2, ap);
         if ((len = vsnprintf(NULL, 0, fmt, ap2)) < 0) {
                 r = SSH_ERR_INVALID_ARGUMENT;
                 goto out;
@@ -278,7 +280,7 @@ sshbuf_putfv(struct sshbuf *buf, const char *fmt, va_list ap)
                 goto out; /* Nothing to do */
         }
         va_end(ap2);
-        va_copy(ap2, ap);
+        VA_COPY(ap2, ap);
         if ((r = sshbuf_reserve(buf, (size_t)len + 1, &p)) < 0)
                 goto out;
         if ((r = vsnprintf((char *)p, len + 1, fmt, ap2)) != len) {