[openssl-commits] [openssl] OpenSSL_1_0_0-stable update

[Dr. Stephen Henson]

The branch OpenSSL_1_0_0-stable has been updated
       via  dafa9534de489bbb0c496eae628cacadcdd01821 (commit)
      from  e35e22e1d930217fa0b879e0a7ae34efd94465e4 (commit)


- Log -----------------------------------------------------------------
commit dafa9534de489bbb0c496eae628cacadcdd01821
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 d25c68c..9f3a411 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);