mirror of
https://github.com/openssl/openssl.git
synced 2024-12-01 05:55:11 +08:00
Fix an uninitialised read in conf_def.c
PR 8882 added a new field to the CONF structure. Unfortunately this structure was created using OPENSSL_malloc() and the new field was not explicitly initialised in the "init" function. Therefore when we came to read it for the first time we got an uninitialised read. Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Shane Lontis <shane.lontis@oracle.com> (Merged from https://github.com/openssl/openssl/pull/10428)
This commit is contained in:
parent
b3b045f6b0
commit
c15faa8d5c
@ -121,9 +121,9 @@ static int def_init_default(CONF *conf)
|
||||
if (conf == NULL)
|
||||
return 0;
|
||||
|
||||
memset(conf, 0, sizeof(*conf));
|
||||
conf->meth = &default_method;
|
||||
conf->meth_data = (void *)CONF_type_default;
|
||||
conf->data = NULL;
|
||||
|
||||
return 1;
|
||||
}
|
||||
@ -134,9 +134,9 @@ static int def_init_WIN32(CONF *conf)
|
||||
if (conf == NULL)
|
||||
return 0;
|
||||
|
||||
memset(conf, 0, sizeof(*conf));
|
||||
conf->meth = &WIN32_method;
|
||||
conf->meth_data = (void *)CONF_type_win32;
|
||||
conf->data = NULL;
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user