From: Zhai Zhaoxuan Date: Tue, 11 Jul 2017 10:12:00 +0000 (+0800) Subject: packages: nvram: fix memory leak in _nvram_free X-Git-Tag: v17.01.5~142 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=06258144266a5adb44d2ef072c2a7c051584a24d;p=oweals%2Fopenwrt.git packages: nvram: fix memory leak in _nvram_free The value of nvram_tuple_t is allocated in _nvram_realloc, but it is not freed in _nvram_free. Signed-off-by: Zhai Zhaoxuan (cherry picked from commit c382237ac33a787043b22abc42f0c5a80278baae) --- diff --git a/package/utils/nvram/src/nvram.c b/package/utils/nvram/src/nvram.c index ca89392107..d5e12ee69a 100644 --- a/package/utils/nvram/src/nvram.c +++ b/package/utils/nvram/src/nvram.c @@ -47,6 +47,8 @@ static void _nvram_free(nvram_handle_t *h) for (i = 0; i < NVRAM_ARRAYSIZE(h->nvram_hash); i++) { for (t = h->nvram_hash[i]; t; t = next) { next = t->next; + if (t->value) + free(t->value); free(t); } h->nvram_hash[i] = NULL; @@ -55,6 +57,8 @@ static void _nvram_free(nvram_handle_t *h) /* Free dead table */ for (t = h->nvram_dead; t; t = next) { next = t->next; + if (t->value) + free(t->value); free(t); }