From 1b5503293922afcd29b7067b99d6b06c18629c9d Mon Sep 17 00:00:00 2001 From: Mariusz Zaborski Date: Sun, 17 Jul 2016 15:36:02 +0000 Subject: [PATCH] Fix nvlist array memory leak. When we change nvl_array_next to NULL it means that we want to destroy or take nvlist_array. The nvpair, which stores next nvlist of nvlist_array element is no longer needed and can be freed. Submitted by: Adam Starak MFC after: 1 week --- sys/contrib/libnv/nvlist.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/contrib/libnv/nvlist.c b/sys/contrib/libnv/nvlist.c index cf8281e7b03d..4da294d3b497 100644 --- a/sys/contrib/libnv/nvlist.c +++ b/sys/contrib/libnv/nvlist.c @@ -236,10 +236,12 @@ nvlist_set_array_next(nvlist_t *nvl, nvpair_t *ele) NVLIST_ASSERT(nvl); - if (ele != NULL) + if (ele != NULL) { nvl->nvl_flags |= NV_FLAG_IN_ARRAY; - else + } else { nvl->nvl_flags &= ~NV_FLAG_IN_ARRAY; + nv_free(nvl->nvl_array_next); + } nvl->nvl_array_next = ele; }