summaryrefslogtreecommitdiff
path: root/app/openssl/crypto/asn1/tasn_enc.c
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2014-12-20 12:06:03 +0100
committerParménides GV <parmegv@sdf.org>2014-12-20 12:06:03 +0100
commit5f6cb652dbd2ef0879673cf7338520dc2be236b9 (patch)
treebc47c8ccbcd48bfc5aee6b404c8ef3f1d9a359cb /app/openssl/crypto/asn1/tasn_enc.c
parent576b0c26baf9b5b1418650a572604325ca7fb3af (diff)
parentf347c871d0433ef3efb85beb5e386b58d700faad (diff)
Merge branch 'develop'
Diffstat (limited to 'app/openssl/crypto/asn1/tasn_enc.c')
-rw-r--r--app/openssl/crypto/asn1/tasn_enc.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/app/openssl/crypto/asn1/tasn_enc.c b/app/openssl/crypto/asn1/tasn_enc.c
index 936ad1f7..1390e5e6 100644
--- a/app/openssl/crypto/asn1/tasn_enc.c
+++ b/app/openssl/crypto/asn1/tasn_enc.c
@@ -453,9 +453,14 @@ static int asn1_set_seq_out(STACK_OF(ASN1_VALUE) *sk, unsigned char **out,
{
derlst = OPENSSL_malloc(sk_ASN1_VALUE_num(sk)
* sizeof(*derlst));
+ if (!derlst)
+ return 0;
tmpdat = OPENSSL_malloc(skcontlen);
- if (!derlst || !tmpdat)
+ if (!tmpdat)
+ {
+ OPENSSL_free(derlst);
return 0;
+ }
}
}
/* If not sorting just output each item */