[openssl-commits] [openssl] master update

[Dr. Stephen Henson]

The branch master has been updated
       via  7c46746bf2958fd2eccc59ecb48039e4e20ce38a (commit)
      from  2dca984babedf93c560aba54da3f4c9222ee0d12 (commit)


- Log -----------------------------------------------------------------
commit 7c46746bf2958fd2eccc59ecb48039e4e20ce38a
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>

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

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 f03f9e9..c215891 100644
--- a/crypto/asn1/tasn_utl.c
+++ b/crypto/asn1/tasn_utl.c
@@ -189,7 +189,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;