Message ID | 20200113114812.166284-1-colin.king@canonical.com |
---|---|
State | Accepted |
Headers | show |
Series | lib: fwts_memorymap: fix resource leak on dir on error return path | expand |
On 2020-01-13 4:48 a.m., Colin King wrote: > From: Colin Ian King <colin.king@canonical.com> > > The error return path is leaking object dir, call closedir to fix > this leak. > > Signed-off-by: Colin Ian King <colin.king@canonical.com> > --- > src/lib/src/fwts_memorymap.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/src/lib/src/fwts_memorymap.c b/src/lib/src/fwts_memorymap.c > index 241b552e..038ccd63 100644 > --- a/src/lib/src/fwts_memorymap.c > +++ b/src/lib/src/fwts_memorymap.c > @@ -315,6 +315,7 @@ fwts_list *fwts_memory_map_table_load(fwts_framework *fw) > entry = fwts_memory_map_table_read_entry(directory->d_name); > if (!entry) { > fwts_memory_map_table_free(memory_map_list); > + (void)closedir(dir); > return NULL; > } > fwts_list_add_ordered(memory_map_list, entry, fwts_fwts_memory_map_entry_compare); > Acked-by: Alex Hung <alex.hung@canonical.com>
On 1/13/20 7:48 PM, Colin King wrote: > From: Colin Ian King <colin.king@canonical.com> > > The error return path is leaking object dir, call closedir to fix > this leak. > > Signed-off-by: Colin Ian King <colin.king@canonical.com> > --- > src/lib/src/fwts_memorymap.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/src/lib/src/fwts_memorymap.c b/src/lib/src/fwts_memorymap.c > index 241b552e..038ccd63 100644 > --- a/src/lib/src/fwts_memorymap.c > +++ b/src/lib/src/fwts_memorymap.c > @@ -315,6 +315,7 @@ fwts_list *fwts_memory_map_table_load(fwts_framework *fw) > entry = fwts_memory_map_table_read_entry(directory->d_name); > if (!entry) { > fwts_memory_map_table_free(memory_map_list); > + (void)closedir(dir); > return NULL; > } > fwts_list_add_ordered(memory_map_list, entry, fwts_fwts_memory_map_entry_compare); > Acked-by: Ivan Hu <ivan.hu@canonical.com>
diff --git a/src/lib/src/fwts_memorymap.c b/src/lib/src/fwts_memorymap.c index 241b552e..038ccd63 100644 --- a/src/lib/src/fwts_memorymap.c +++ b/src/lib/src/fwts_memorymap.c @@ -315,6 +315,7 @@ fwts_list *fwts_memory_map_table_load(fwts_framework *fw) entry = fwts_memory_map_table_read_entry(directory->d_name); if (!entry) { fwts_memory_map_table_free(memory_map_list); + (void)closedir(dir); return NULL; } fwts_list_add_ordered(memory_map_list, entry, fwts_fwts_memory_map_entry_compare);