third-party-mirrors/sslh
1
0
Fork 0
mirror of https://github.com/yrutschle/sslh.git synced 2025-04-18 17:57:39 +03:00
Code Issues Packages Projects Releases Wiki Activity

Always initialize config_t structure, fixes #270

Browse Source 
Without this change the config_t structure is ONLY initialized when it
meets a specific criterion. If this criterion is not met the config_t
structure is still used, which can cause a segmentation fault.

Fixes #270.
This commit is contained in:
Björn Ketelaars 2020-07-14 06:57:43 +02:00
parent de8e5725c2
commit b473622698
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sslh-conf.c
View File

@ -1432,7 +1432,6 @@ static int read_compounds(config_setting_t* cfg,
static int c2s_parse_file(const char* filename, config_t* c, char**errmsg) static int c2s_parse_file(const char* filename, config_t* c, char**errmsg)
{ {
/* Read config file */ /* Read config file */
config_init(c);
if (config_read_file(c, filename) == CONFIG_FALSE) { if (config_read_file(c, filename) == CONFIG_FALSE) {
if (config_error_line(c) != 0) { if (config_error_line(c) != 0) {
asprintf(errmsg, "%s:%d:%s", asprintf(errmsg, "%s:%d:%s",
@ -1488,7 +1487,7 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
return 0; return 0;
} }
config_init(&c);
if (sslhcfg_conffile->count) { if (sslhcfg_conffile->count) {
if (!c2s_parse_file(sslhcfg_conffile->filename[0], &c, &errmsg)) { if (!c2s_parse_file(sslhcfg_conffile->filename[0], &c, &errmsg)) {
fprintf(stderr, "%s\n", errmsg); fprintf(stderr, "%s\n", errmsg);