From owner-svn-src-all@freebsd.org Wed Mar 2 03:40:27 2016 Return-Path: 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 417EBAC01E1; Wed, 2 Mar 2016 03:40:27 +0000 (UTC) (envelope-from truckman@FreeBSD.org) Received: from gw.catspoiler.org (unknown [IPv6:2602:304:b010:ef20::f2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "gw.catspoiler.org", Issuer "gw.catspoiler.org" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 2840A1965; Wed, 2 Mar 2016 03:40:27 +0000 (UTC) (envelope-from truckman@FreeBSD.org) Received: from FreeBSD.org (mousie.catspoiler.org [192.168.101.2]) by gw.catspoiler.org (8.15.2/8.15.2) with ESMTP id u223eHI1055157; Tue, 1 Mar 2016 19:40:21 -0800 (PST) (envelope-from truckman@FreeBSD.org) Message-Id: <201603020340.u223eHI1055157@gw.catspoiler.org> Date: Tue, 1 Mar 2016 19:40:16 -0800 (PST) From: Don Lewis Subject: Re: svn commit: r296299 - head/sys/contrib/ipfilter/netinet To: cy@FreeBSD.org cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org In-Reply-To: <201603020328.u223SwLU036267@repo.freebsd.org> MIME-Version: 1.0 Content-Type: TEXT/plain; charset=us-ascii X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Mar 2016 03:40:27 -0000 On 2 Mar, Cy Schubert wrote: > Author: cy > Date: Wed Mar 2 03:28:57 2016 > New Revision: 296299 > URL: https://svnweb.freebsd.org/changeset/base/296299 > > Log: > Remove redundant NULL pointer comparison. > > Reported by: PVS-Studio (V595) in D5245 > Differential Revision: D5245 > > Modified: > head/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c > > Modified: head/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c > ============================================================================== > --- head/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c Wed Mar 2 03:26:56 2016 (r296298) > +++ head/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c Wed Mar 2 03:28:57 2016 (r296299) > @@ -1951,10 +1951,6 @@ ipf_p_ftp_epsv(softf, fin, ip, nat, ftp, > ap += *s++ - '0'; > } > > - if (!s) { > - return 0; > -} > - > if (*s == '|') > s++; > if (*s == ')') > I wonder if that test was meant to be: if (!*s) { especially since hitting the end of the string terminates the preceeding loop?