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
@@ -632,6 +632,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)
{
char buf[512];
@@ -653,9 +657,9 @@ int OBJ_create_objects(BIO *in)
*(s++) = '\0';
while (ossl_isspace(*s))
s++;
- if (*s == '\0')
+ if (*s == '\0') {
s = NULL;
- else {
+ } else {
l = s;
while (*l != '\0' && !ossl_isspace(*l))
l++;
@@ -663,14 +667,17 @@ int OBJ_create_objects(BIO *in)
*(l++) = '\0';
while (ossl_isspace(*l))
l++;
- if (*l == '\0')
+ if (*l == '\0') {
l = NULL;
- } else
+ }
+ } else {
l = NULL;
}
- } else
+ }
+ } else {
s = NULL;
- if ((o == NULL) || (*o == '\0'))
+ }
+ if (*o == '\0')
return num;
if (!OBJ_create(o, s, l))
return num;
