[openssl-commits] [openssl] OpenSSL_1_0_2-stable update

[Dr. Stephen Henson]

The branch OpenSSL_1_0_2-stable has been updated
       via  c4210673313482edacede58d92e92c213d7a181a (commit)
      from  32957936b54c5c07b8e7d6eeeca54705ffe93ace (commit)


- Log -----------------------------------------------------------------
commit c4210673313482edacede58d92e92c213d7a181a
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Tue Jun 14 17:44:22 2016 +0100

    Fix omitted selector handling.
    
    The selector field could be omitted because it has a DEFAULT value.
    In this case *sfld == NULL (sfld can never be NULL). This was not
    noticed because this was never used in existing ASN.1 modules.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (cherry picked from commit 7c46746bf2958fd2eccc59ecb48039e4e20ce38a)

-----------------------------------------------------------------------

Summary of changes:
 crypto/asn1/tasn_utl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/asn1/tasn_utl.c b/crypto/asn1/tasn_utl.c
index 41726d8..e14889f 100644
--- a/crypto/asn1/tasn_utl.c
+++ b/crypto/asn1/tasn_utl.c
@@ -234,7 +234,7 @@ const ASN1_TEMPLATE *asn1_do_adb(ASN1_VALUE **pval, const ASN1_TEMPLATE *tt,
     sfld = offset2ptr(*pval, adb->offset);
 
     /* Check if NULL */
-    if (!sfld) {
+    if (*sfld == NULL) {
         if (!adb->null_tt)
             goto err;
         return adb->null_tt;