From owner-svn-src-all@FreeBSD.ORG  Tue Jan 10 01:02:19 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DAB2A106566B;
	Tue, 10 Jan 2012 01:02:19 +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 C47E48FC08;
	Tue, 10 Jan 2012 01:02:19 +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 q0A12JNj072730;
	Tue, 10 Jan 2012 01:02:19 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0A12JML072727;
	Tue, 10 Jan 2012 01:02:19 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201201100102.q0A12JML072727@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Tue, 10 Jan 2012 01:02:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r229900 - in stable/8/usr.sbin: fwcontrol newsyslog
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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: <http://lists.freebsd.org/mailman/listinfo/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: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Jan 2012 01:02:20 -0000

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

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

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

Modified: stable/8/usr.sbin/fwcontrol/fwcontrol.c
==============================================================================
--- stable/8/usr.sbin/fwcontrol/fwcontrol.c	Tue Jan 10 01:01:57 2012	(r229899)
+++ stable/8/usr.sbin/fwcontrol/fwcontrol.c	Tue Jan 10 01:02:19 2012	(r229900)
@@ -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;
 		}
 	}

Modified: stable/8/usr.sbin/newsyslog/newsyslog.c
==============================================================================
--- stable/8/usr.sbin/newsyslog/newsyslog.c	Tue Jan 10 01:01:57 2012	(r229899)
+++ stable/8/usr.sbin/newsyslog/newsyslog.c	Tue Jan 10 01:02:19 2012	(r229900)
@@ -1914,9 +1914,10 @@ do_zipwork(struct zipwork_entry *zwork)
 	pid_t pidzip, wpid;
 	char zresult[MAXPATHLEN];
 
+	assert(zwork != NULL);
 	pgm_path = NULL;
 	strlcpy(zresult, zwork->zw_fname, sizeof(zresult));
-	if (zwork != NULL && zwork->zw_conf != NULL &&
+	if (zwork->zw_conf != NULL &&
 	    zwork->zw_conf->compress > COMPRESS_NONE)
 		for (int c = 1; c < COMPRESS_TYPES; c++) {
 			if (zwork->zw_conf->compress == c) {