From owner-svn-src-stable-7@FreeBSD.ORG  Tue Jan 10 01:02:41 2012
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 213261065782;
	Tue, 10 Jan 2012 01:02:41 +0000 (UTC)
	(envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 0BDC68FC21;
	Tue, 10 Jan 2012 01:02:41 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q0A12eBV072791;
	Tue, 10 Jan 2012 01:02:40 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0A12eXp072788;
	Tue, 10 Jan 2012 01:02:40 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201201100102.q0A12eXp072788@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Tue, 10 Jan 2012 01:02:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r229901 - stable/7/usr.sbin/fwcontrol
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Jan 2012 01:02:41 -0000

Author: eadler (ports committer)
Date: Tue Jan 10 01:02:40 2012
New Revision: 229901
URL: http://svn.freebsd.org/changeset/base/229901

Log:
  - Remove extraneous null ptr deref checks
  - Fix memory leak
  
  Approved by:	jhb

Modified:
  stable/7/usr.sbin/fwcontrol/fwcontrol.c
Directory Properties:
  stable/7/usr.sbin/fwcontrol/   (props changed)

Modified: stable/7/usr.sbin/fwcontrol/fwcontrol.c
==============================================================================
--- stable/7/usr.sbin/fwcontrol/fwcontrol.c	Tue Jan 10 01:02:19 2012	(r229900)
+++ stable/7/usr.sbin/fwcontrol/fwcontrol.c	Tue Jan 10 01:02:40 2012	(r229901)
@@ -152,8 +152,7 @@ str2node(int fd, const char *nodestr)
 		fweui2eui64(&data->dev[i].eui, &tmpeui);
 		if (memcmp(&eui, &tmpeui, sizeof(struct eui64)) == 0) {
 			node = data->dev[i].dst;
-			if (data != NULL)
-				free(data);
+			free(data);
 			goto gotnode;
 		}
 	}