cfgfile: fix uninitialized variable on load error
authorDmitriy Yakovlev <bombermag@gmail.com>
Tue, 7 Feb 2017 02:51:06 +0000 (05:51 +0300)
committerThomas Monjalon <thomas.monjalon@6wind.com>
Tue, 14 Feb 2017 17:13:48 +0000 (18:13 +0100)
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: eaafbad419bf ("cfgfile: library to interpret config files")

Signed-off-by: Dmitriy Yakovlev <bombermag@gmail.com>
Acked-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
lib/librte_cfgfile/rte_cfgfile.c

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