Commit 31c8b265 authored by Rich Salz's avatar Rich Salz
Browse files

Avoid out-of-bounds read 



Fixes CVE 2017-3735

Reviewed-by: default avatarKurt Roeckx <kurt@roeckx.be>
(Merged from https://github.com/openssl/openssl/pull/4276)

(cherry picked from commit b2317174)
parent 917552f3

crypto/x509v3/v3_addr.c

+6 −4
Original line number Diff line number Diff line
@@ -130,10 +130,12 @@ static int length_from_afi(const unsigned afi) 
 */

unsigned int v3_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];

}



/*