1 files changed, 5 insertions, 8 deletions

diff --git a/src/lib/libcrypto/err/err.c b/src/lib/libcrypto/err/err.c
index fcdb244008..69713a6e2f 100644
--- a/src/lib/libcrypto/err/err.c
+++ b/src/lib/libcrypto/err/err.c
@@ -1066,13 +1066,6 @@ void ERR_set_error_data(char *data, int flags)
 void ERR_add_error_data(int num, ...)
         {
         va_list args;
-        va_start(args, num);
-        ERR_add_error_vdata(num, args);
-        va_end(args);
-        }
-
-void ERR_add_error_vdata(int num, va_list args)
-        {
         int i,n,s;
         char *str,*p,*a;
 
@@ -1081,6 +1074,7 @@ void ERR_add_error_vdata(int num, va_list args)
         if (str == NULL) return;
         str[0]='\0';
 
+        va_start(args, num);
         n=0;
         for (i=0; i<num; i++)
                 {
@@ -1096,7 +1090,7 @@ void ERR_add_error_vdata(int num, va_list args)
                                 if (p == NULL)
                                         {
                                         OPENSSL_free(str);
-                                        return;
+                                        goto err;
                                         }
                                 else
                                         str=p;
@@ -1105,6 +1099,9 @@ void ERR_add_error_vdata(int num, va_list args)
                         }
                 }
         ERR_set_error_data(str,ERR_TXT_MALLOCED|ERR_TXT_STRING);
+
+err:
+        va_end(args);
         }
 
 int ERR_set_mark(void)