Fix a memory leak in 'sk_dup' in the case a realloc() fails. Also, tidy up
a bit of weird code in sk_new.
diff --git a/CHANGES b/CHANGES
index ccc991b..03f9d02 100644
--- a/CHANGES
+++ b/CHANGES
@@ -11,6 +11,10 @@
*) applies to 0.9.6a (/0.9.6b) and 0.9.7
+) applies to 0.9.7 only
+ +) Fix a memory leak in 'sk_dup()' in the case reallocation fails. (Also
+ tidy up some unecessarily weird code in 'sk_new()').
+ [Geoff, reported by Diego Tartara <dtartara@novamens.com>]
+
+) Change the key loading routines for ENGINEs to use the same kind
callback (pem_password_cb) as all other routines that need this
kind of callback.
diff --git a/crypto/stack/stack.c b/crypto/stack/stack.c
index 9a75e43..2496f28 100644
--- a/crypto/stack/stack.c
+++ b/crypto/stack/stack.c
@@ -106,6 +106,8 @@
ret->comp=sk->comp;
return(ret);
err:
+ if(ret)
+ sk_free(ret);
return(NULL);
}
@@ -120,9 +122,9 @@
int i;
if ((ret=(STACK *)OPENSSL_malloc(sizeof(STACK))) == NULL)
- goto err0;
+ goto err;
if ((ret->data=(char **)OPENSSL_malloc(sizeof(char *)*MIN_NODES)) == NULL)
- goto err1;
+ goto err;
for (i=0; i<MIN_NODES; i++)
ret->data[i]=NULL;
ret->comp=c;
@@ -130,9 +132,9 @@
ret->num=0;
ret->sorted=0;
return(ret);
-err1:
- OPENSSL_free(ret);
-err0:
+err:
+ if(ret)
+ OPENSSL_free(ret);
return(NULL);
}
