diff options
| author |   beck <beck@openbsd.org> | 2002-05-15 02:29:01 +0000 |
|---|---|---|
| committer | beck <beck@openbsd.org> | 2002-05-15 02:29:01 +0000 |
| commit | da347917d3d3e5d3ece379d298f4e183b4828151 (patch) | |
| tree | 4667bec6fb5a5191ed165d4bf727adbb97475bcb /lib/libcrypto/stack/stack.c | |
| parent | OpenSSL 0.9.7 (diff) | |
| download | wireguard-openbsd-da347917d3d3e5d3ece379d298f4e183b4828151.tar.xz wireguard-openbsd-da347917d3d3e5d3ece379d298f4e183b4828151.zip | |
OpenSSL 0.9.7 stable 2002 05 08 merge
Diffstat (limited to 'lib/libcrypto/stack/stack.c')
| -rw-r--r-- | lib/libcrypto/stack/stack.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/lib/libcrypto/stack/stack.c b/lib/libcrypto/stack/stack.c index 02857f04466..2496f28a8c0 100644 --- a/lib/libcrypto/stack/stack.c +++ b/lib/libcrypto/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; i<MIN_NODES; i++) ret->data[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); } @@ -316,7 +318,7 @@ char *sk_set(STACK *st, int i, char *value) void sk_sort(STACK *st) { - if (!st->sorted) + if (st && !st->sorted) { int (*comp_func)(const void *,const void *); |