[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  b23171744b01e473ebbfd6edad70c1c3825ffbcd (commit)
      from  302eba3f6dd588f1269aba4605a007ae86b583db (commit)


- Log -----------------------------------------------------------------
commit b23171744b01e473ebbfd6edad70c1c3825ffbcd
Author: Rich Salz <rsalz at openssl.org>
Date:   Tue Aug 22 11:44:41 2017 -0400

    Avoid out-of-bounds read
    
    Fixes CVE 2017-3735
    
    Reviewed-by: Kurt Roeckx <kurt at roeckx.be>
    (Merged from https://github.com/openssl/openssl/pull/4276)

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

Summary of changes:
 crypto/x509v3/v3_addr.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/crypto/x509v3/v3_addr.c b/crypto/x509v3/v3_addr.c
index f4e1298..bb58e04 100644
--- a/crypto/x509v3/v3_addr.c
+++ b/crypto/x509v3/v3_addr.c
@@ -84,10 +84,12 @@ static int length_from_afi(const unsigned afi)
  */
 unsigned int X509v3_addr_get_afi(const IPAddressFamily *f)
 {
-    return ((f != NULL &&
-             f->addressFamily != NULL && f->addressFamily->data != NULL)
-            ? ((f->addressFamily->data[0] << 8) | (f->addressFamily->data[1]))
-            : 0);
+    if (f == NULL
+            || f->addressFamily == NULL
+            || f->addressFamily->data == NULL
+            || f->addressFamily->length < 2)
+        return 0;
+    return (f->addressFamily->data[0] << 8) | f->addressFamily->data[1];
 }
 
 /*