Date: Wed, 9 Dec 2015 19:19:36 +0000 (UTC) From: Craig Rodrigues <rodrigc@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r292021 - head/lib/libopenbsd Message-ID: <201512091919.tB9JJa3V089833@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rodrigc Date: Wed Dec 9 19:19:36 2015 New Revision: 292021 URL: https://svnweb.freebsd.org/changeset/base/292021 Log: Merge from OpenBSD: revision 1.11 date: 2015/11/27 01:57:59; author: mmcc; state: Exp; lines: +2 -3 Remove three NULL-checks before free(). ok millert@ Modified: head/lib/libopenbsd/imsg.c Modified: head/lib/libopenbsd/imsg.c ============================================================================== --- head/lib/libopenbsd/imsg.c Wed Dec 9 18:55:25 2015 (r292020) +++ head/lib/libopenbsd/imsg.c Wed Dec 9 19:19:36 2015 (r292021) @@ -1,4 +1,4 @@ -/* $OpenBSD: imsg.c,v 1.10 2015/07/19 07:18:59 nicm Exp $ */ +/* $OpenBSD: imsg.c,v 1.11 2015/11/27 01:57:59 mmcc Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -120,8 +120,7 @@ again: } fail: - if (ifd) - free(ifd); + free(ifd); return (n); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201512091919.tB9JJa3V089833>