From owner-svn-src-all@freebsd.org Wed Mar 2 04:17:26 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 67CEAAC0E28; Wed, 2 Mar 2016 04:17:26 +0000 (UTC) (envelope-from cy.schubert@komquats.com) Received: from smtp-out-so.shaw.ca (smtp-out-so.shaw.ca [64.59.136.139]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 08B801AE7; Wed, 2 Mar 2016 04:17:25 +0000 (UTC) (envelope-from cy.schubert@komquats.com) Received: from spqr.komquats.com ([96.50.22.10]) by shaw.ca with SMTP id ay96aD4RN0h8Nay97aylWo; Tue, 01 Mar 2016 21:12:22 -0700 X-Authority-Analysis: v=2.1 cv=VIR9547X c=1 sm=1 tr=0 a=jvE2nwUzI0ECrNeyr98KWA==:117 a=jvE2nwUzI0ECrNeyr98KWA==:17 a=L9H7d07YOLsA:10 a=9cW_t1CCXrUA:10 a=s5jvgZ67dGcA:10 a=kj9zAlcOel0A:10 a=7OsogOcEt9IA:10 a=6I5d2MoRAAAA:8 a=BWvPGDcYAAAA:8 a=YxBL1-UpAAAA:8 a=FXTuGqRcememwQUxFMwA:9 a=CjuIK1q_8ugA:10 Received: from slippy.cwsent.com (slippy8 [10.2.2.6]) by spqr.komquats.com (Postfix) with ESMTP id A174013B1F; Tue, 1 Mar 2016 20:12:20 -0800 (PST) Received: from slippy (localhost [127.0.0.1]) by slippy.cwsent.com (8.15.2/8.15.2) with ESMTP id u224C4g6005145; Tue, 1 Mar 2016 20:12:04 -0800 (PST) (envelope-from Cy.Schubert@komquats.com) Message-Id: <201603020412.u224C4g6005145@slippy.cwsent.com> X-Mailer: exmh version 2.8.0 04/21/2012 with nmh-1.6 Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.komquats.com/ To: araujo@FreeBSD.org cc: Don Lewis , Cy Schubert , "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , "src-committers@freebsd.org" Subject: Re: svn commit: r296299 - head/sys/contrib/ipfilter/netinet In-Reply-To: Message from Marcelo Araujo of "Wed, 02 Mar 2016 11:41:53 +0800." Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Tue, 01 Mar 2016 20:12:04 -0800 X-CMAE-Envelope: MS4wfBUKmEiLdUUrjO5d3ZrIB8o9YfrgDaT7pK2Ousr4drfaiDkssQ9pb/w5ErcI7/VQszD3ojTpIHW7MSqW/2olfC27cNOmB+TEFXn2CFTfnHCioiwqyOh7 unBwSRTFhFFZmXEPrUA5Mdm3kl11yxQxsRVL/gSwwbj+PVmbqdQ2KDd2LFruP0kpkuSEOGp0yyaTk87z1bhuLeQ1/ofjIXt+In/gQdfbo983pmbC867p1/pj EZ5bVTXjM9+7XsrrPnJBVLmqNG0OgyjrUUSHnXdSWMwxybYQZ2/0MItnE1GUdQiXOHh/w2WRGMmlsHyRROOgUANc3bzM/4On+8y7nnqrswM= 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 04:17:26 -0000 In message , Marcelo Araujo writes: > --001a113c48b0b9a687052d08a983 > 2016-03-02 11:40 GMT+08:00 Don Lewis : > > > 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? > > > > > > > +1 here, looks like it meant to be !*s. The preceding is terminated by a linefeed at line 1963. -- Cheers, Cy Schubert or FreeBSD UNIX: Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few.