aboutsummaryrefslogtreecommitdiff
path: root/openssl/crypto/asn1/tasn_enc.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2014-09-02 18:24:12 +0200
committerMike DePaulo <mikedep333@gmail.com>2015-02-28 07:15:53 -0500
commit8fafe3481b134a4d368ba57e3698754a6a45c4c1 (patch)
treeb617e841e1b5c0b234f7698331e5fb1be1c2332a /openssl/crypto/asn1/tasn_enc.c
parentfe03d6aef6338e43593f164b09ae993bcd0ecbdd (diff)
downloadvcxsrv-8fafe3481b134a4d368ba57e3698754a6a45c4c1.tar.gz
vcxsrv-8fafe3481b134a4d368ba57e3698754a6a45c4c1.tar.bz2
vcxsrv-8fafe3481b134a4d368ba57e3698754a6a45c4c1.zip
Upgrade openssl to version openssl-1.0.1i
Diffstat (limited to 'openssl/crypto/asn1/tasn_enc.c')
-rw-r--r--openssl/crypto/asn1/tasn_enc.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/openssl/crypto/asn1/tasn_enc.c b/openssl/crypto/asn1/tasn_enc.c
index 936ad1f76..1390e5e6a 100644
--- a/openssl/crypto/asn1/tasn_enc.c
+++ b/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 */