From owner-svn-src-all@freebsd.org  Fri Apr 22 05:14:13 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 986E2B189D1;
 Fri, 22 Apr 2016 05:14:13 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 5318B1189;
 Fri, 22 Apr 2016 05:14:13 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3M5ECdm085610;
 Fri, 22 Apr 2016 05:14:12 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3M5EC0Z085609;
 Fri, 22 Apr 2016 05:14:12 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201604220514.u3M5EC0Z085609@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Fri, 22 Apr 2016 05:14:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r298448 - head/contrib/bsnmp/snmpd
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 22 Apr 2016 05:14:13 -0000

Author: ngie
Date: Fri Apr 22 05:14:12 2016
New Revision: 298448
URL: https://svnweb.freebsd.org/changeset/base/298448

Log:
  Don't leak `string` in parse_define(..) when a macro has been found
  and the parser token != TOK_ASSIGN
  
  MFC after: 1 week
  CID: 1007187, 1007188
  Reported by: Coverity
  Obtained from: Isilon OneFS (part of r445479)
  Submitted by: Miles Ohlrich <miles.ohlrich@isilon.com>
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/contrib/bsnmp/snmpd/config.c

Modified: head/contrib/bsnmp/snmpd/config.c
==============================================================================
--- head/contrib/bsnmp/snmpd/config.c	Fri Apr 22 05:07:59 2016	(r298447)
+++ head/contrib/bsnmp/snmpd/config.c	Fri Apr 22 05:14:12 2016	(r298448)
@@ -1150,7 +1150,8 @@ parse_define(const char *varname)
 			free(m->value);
 			m->value = string;
 			m->length = length;
-		}
+		} else
+			free(string);
 	}
 
 	token = TOK_EOL;