Commit a1daedd8 authored by FdaSilvaYY's avatar FdaSilvaYY Committed by Rich Salz
Browse files

Fix an incoherent test. 



Pointer 'o' is set inside a local buffer, so it can't be NULL.
Also fix coding style and add comments

Reviewed-by: default avatarTim Hudson <tjh@openssl.org>
Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4754)
(cherry picked from commit cef115ff)
parent e167fd05

crypto/objects/obj_dat.c

+14 −7
Original line number Diff line number Diff line
@@ -725,6 +725,10 @@ const void *OBJ_bsearch_ex_(const void *key, const void *base_, int num, 
    return (p);

}



/*

 * Parse a BIO sink to create some extra oid's objects.

 * Line format:<OID:isdigit or '.']><isspace><SN><isspace><LN>

 */

int OBJ_create_objects(BIO *in)

{

    MS_STATIC char buf[512];
@@ -746,9 +750,9 @@ int OBJ_create_objects(BIO *in) 
            *(s++) = '\0';

            while (isspace((unsigned char)*s))

                s++;

            if (*s == '\0')

            if (*s == '\0') {

                s = NULL;

            else {

            } else {

                l = s;

                while ((*l != '\0') && !isspace((unsigned char)*l))

                    l++;
@@ -756,15 +760,18 @@ int OBJ_create_objects(BIO *in) 
                    *(l++) = '\0';

                    while (isspace((unsigned char)*l))

                        l++;

                    if (*l == '\0')

                    if (*l == '\0') {

                        l = NULL;

                } else

                    }

                } else {

                    l = NULL;

                }

        } else

            }

        } else {

            s = NULL;

        if ((o == NULL) || (*o == '\0'))

            return (num);

        }

        if (*o == '\0')

            return num;

        if (!OBJ_create(o, s, l))

            return (num);

        num++;