Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 8 Aug 2016 06:29:25 +0000 (UTC)
From:      Mariusz Zaborski <oshogbo@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject:   svn commit: r303825 - stable/11/sys/contrib/libnv
Message-ID:  <201608080629.u786TQxC023997@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: oshogbo
Date: Mon Aug  8 06:29:25 2016
New Revision: 303825
URL: https://svnweb.freebsd.org/changeset/base/303825

Log:
  MFC r302965:
    Fix memory leak in the nvlist string array.
  
    Submitted by: Adam Starak <starak.adam@gmail.com>
    Approved by:	re (gjb)

Modified:
  stable/11/sys/contrib/libnv/nvpair.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/contrib/libnv/nvpair.c
==============================================================================
--- stable/11/sys/contrib/libnv/nvpair.c	Mon Aug  8 06:18:54 2016	(r303824)
+++ stable/11/sys/contrib/libnv/nvpair.c	Mon Aug  8 06:29:25 2016	(r303825)
@@ -1945,6 +1945,7 @@ nvpair_free(nvpair_t *nvp)
 	case NV_TYPE_STRING_ARRAY:
 		for (i = 0; i < nvp->nvp_nitems; i++)
 			nv_free(((char **)(intptr_t)nvp->nvp_data)[i]);
+		nv_free((char **)(intptr_t)nvp->nvp_data);
 		break;
 	}
 	nv_free(nvp);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201608080629.u786TQxC023997>