commit 754106713fd349be267ec0dfe6f4f8a97c1b3cdb
author Alexandre Savard <alexandre.savard@savoirfairelinux.com> Wed Aug 08 09:50:01 2012 -0400
committer Alexandre Savard <alexandre.savard@savoirfairelinux.com> Wed Aug 08 09:50:01 2012 -0400
tree 767702dc681aea550f7c8c626e936e019981b7dc
parent ace91efcc58b8704c3e8e9c03e33afc1a59aecc3

#14465: Update openssl to tag android-4.0.4_r2.1

jni/openssl/crypto/err/err.c

diff --git a/jni/openssl/crypto/err/err.c b/jni/openssl/crypto/err/err.c
index fcdb244..69713a6 100644
--- a/jni/openssl/crypto/err/err.c
+++ b/jni/openssl/crypto/err/err.c
@@ -1066,13 +1066,6 @@
 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 @@
 	if (str == NULL) return;
 	str[0]='\0';
 
+	va_start(args, num);
 	n=0;
 	for (i=0; i<num; i++)
 		{
@@ -1096,7 +1090,7 @@
 				if (p == NULL)
 					{
 					OPENSSL_free(str);
-					return;
+					goto err;
 					}
 				else
 					str=p;
@@ -1105,6 +1099,9 @@
 			}
 		}
 	ERR_set_error_data(str,ERR_TXT_MALLOCED|ERR_TXT_STRING);
+
+err:
+	va_end(args);
 	}
 
 int ERR_set_mark(void)