From d918f85146ca8e01d721518aac7575976aebdfd1 Mon Sep 17 00:00:00 2001 From: Geoff Thorpe Date: Thu, 31 May 2001 19:01:08 +0000 Subject: [PATCH] Fix a memory leak in 'sk_dup' in the case a realloc() fails. Also, tidy up a bit of weird code in sk_new. --- CHANGES | 4 ++++ crypto/stack/stack.c | 12 +++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/CHANGES b/CHANGES index ccc991b959..03f9d02abe 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 ] + +) 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 9a75e433d7..2496f28a8c 100644 --- a/crypto/stack/stack.c +++ b/crypto/stack/stack.c @@ -106,6 +106,8 @@ STACK *sk_dup(STACK *sk) ret->comp=sk->comp; return(ret); err: + if(ret) + sk_free(ret); return(NULL); } @@ -120,9 +122,9 @@ STACK *sk_new(int (*c)(const char * const *, const char * const *)) 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; idata[i]=NULL; ret->comp=c; @@ -130,9 +132,9 @@ STACK *sk_new(int (*c)(const char * const *, const char * const *)) ret->num=0; ret->sorted=0; return(ret); -err1: - OPENSSL_free(ret); -err0: +err: + if(ret) + OPENSSL_free(ret); return(NULL); }