summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2016-06-14 17:44:22 +0100
committerDr. Stephen Henson <steve@openssl.org>2016-06-14 19:16:19 +0100
commitc4210673313482edacede58d92e92c213d7a181a (patch)
treeadeb48996044d0c8275d3402161adeace1770c6b
parent32957936b54c5c07b8e7d6eeeca54705ffe93ace (diff)
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@openssl.org> (cherry picked from commit 7c46746bf2958fd2eccc59ecb48039e4e20ce38a)
-rw-r--r--crypto/asn1/tasn_utl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/asn1/tasn_utl.c b/crypto/asn1/tasn_utl.c
index 41726d8feb..e14889feb1 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;