[openssl-commits] [openssl] OpenSSL_1_0_2-stable update
Dr. Stephen Henson
steve at openssl.org
Fri Apr 10 18:55:02 UTC 2015
The branch OpenSSL_1_0_2-stable has been updated
via 6df777ed508ca785b31d6e92e73961ac282ab3ea (commit)
from 07395b7a6dfdbe263677e58519f1d11d51d31da5 (commit)
- Log -----------------------------------------------------------------
commit 6df777ed508ca785b31d6e92e73961ac282ab3ea
Author: Dr. Stephen Henson <steve at openssl.org>
Date: Thu Apr 2 13:45:14 2015 +0100
Don't set *pval to NULL in ASN1_item_ex_new.
While *pval is usually a pointer in rare circumstances it can be a long
value. One some platforms (e.g. WIN64) where
sizeof(long) < sizeof(ASN1_VALUE *) this will write past the field.
*pval is initialised correctly in the rest of ASN1_item_ex_new so setting it
to NULL is unecessary anyway.
Thanks to Julien Kauffmann for reporting this issue.
Reviewed-by: Richard Levitte <levitte at openssl.org>
(cherry picked from commit f617b4969a9261b9d7d381670aefbe2cf766a2cb)
Conflicts:
crypto/asn1/tasn_new.c
-----------------------------------------------------------------------
Summary of changes:
crypto/asn1/tasn_new.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/crypto/asn1/tasn_new.c b/crypto/asn1/tasn_new.c
index 7d2964f..b0c73be 100644
--- a/crypto/asn1/tasn_new.c
+++ b/crypto/asn1/tasn_new.c
@@ -100,9 +100,6 @@ static int asn1_item_ex_combine_new(ASN1_VALUE **pval, const ASN1_ITEM *it,
else
asn1_cb = 0;
- if (!combine)
- *pval = NULL;
-
#ifdef CRYPTO_MDEBUG
if (it->sname)
CRYPTO_push_info(it->sname);
More information about the openssl-commits
mailing list