d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cfgfile: fix uninitialized variable on load error

Browse Source 
Uninitialized scalar variable.
Using uninitialized value cfg->sections[curr_section]->num_entries
when calling rte_cfgfile_close.
And memory in variables cfg->sections[curr_section],
sect->entries[curr_entry] maybe not equal NULL.
We must decrement counters curr_section, curr_entry when failed to realloc.

Fixes: eaafbad419 ("cfgfile: library to interpret config files")

Signed-off-by: Dmitriy Yakovlev <bombermag@gmail.com>
Acked-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
This commit is contained in:
Dmitriy Yakovlev 2017-02-07 05:51:06 +03:00 committed by Thomas Monjalon
parent 9375228852
commit e7ee2ca1c9
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/librte_cfgfile/rte_cfgfile.c
View File

@ -151,6 +151,7 @@ rte_cfgfile_load(const char *filename, int flags)
sizeof(*cfg) + sizeof(cfg->sections[0]) sizeof(*cfg) + sizeof(cfg->sections[0])
* allocated_sections); * allocated_sections);
if (n_cfg == NULL) { if (n_cfg == NULL) {
curr_section--;
printf("Error - no more memory\n"); printf("Error - no more memory\n");
goto error1; goto error1;
} }
@ -198,6 +199,7 @@ rte_cfgfile_load(const char *filename, int flags)
sizeof(sect->entries[0]) * sizeof(sect->entries[0]) *
allocated_entries); allocated_entries);
if (n_sect == NULL) { if (n_sect == NULL) {
curr_entry--;
printf("Error - no more memory\n"); printf("Error - no more memory\n");
goto error1; goto error1;
} }
@ -233,6 +235,8 @@ rte_cfgfile_load(const char *filename, int flags)
error1: error1:
cfg->num_sections = curr_section + 1; cfg->num_sections = curr_section + 1;
if (curr_section >= 0)
cfg->sections[curr_section]->num_entries = curr_entry + 1;
rte_cfgfile_close(cfg); rte_cfgfile_close(cfg);
error2: error2:
fclose(f); fclose(f);