Other errors are possible.

This commit is contained in:
Ben Laurie 2002-01-18 12:19:24 +00:00
parent 1cfa8a397f
commit dd2589494f

View File

@ -348,13 +348,20 @@ static int module_init(CONF_MODULE *pmod, char *name, char *value, CONF *cnf)
} }
if (initialized_modules == NULL) if (initialized_modules == NULL)
{
initialized_modules = sk_CONF_IMODULE_new_null(); initialized_modules = sk_CONF_IMODULE_new_null();
if (!initialized_modules)
if (!initialized_modules) {
goto err; CONFerr(CONF_F_MODULE_INIT, ERR_R_MALLOC_FAILURE);
goto err;
}
}
if (!sk_CONF_IMODULE_push(initialized_modules, imod)) if (!sk_CONF_IMODULE_push(initialized_modules, imod))
{
CONFerr(CONF_F_MODULE_INIT, ERR_R_MALLOC_FAILURE);
goto err; goto err;
}
pmod->links++; pmod->links++;
@ -362,8 +369,6 @@ static int module_init(CONF_MODULE *pmod, char *name, char *value, CONF *cnf)
err: err:
CONFerr(CONF_F_MODULE_INIT, ERR_R_MALLOC_FAILURE);
/* We've started the module so we'd better finish it */ /* We've started the module so we'd better finish it */
if (pmod->finish && init_called) if (pmod->finish && init_called)
pmod->finish(imod); pmod->finish(imod);