From owner-svn-src-head@freebsd.org Tue Mar 7 15:32:34 2017 Return-Path: Delivered-To: svn-src-head@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 54066D0175F; Tue, 7 Mar 2017 15:32:34 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C61D712CF; Tue, 7 Mar 2017 15:32:33 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from tom.home (kib@localhost [127.0.0.1]) by kib.kiev.ua (8.15.2/8.15.2) with ESMTPS id v27FWRmv089555 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Tue, 7 Mar 2017 17:32:27 +0200 (EET) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua v27FWRmv089555 Received: (from kostik@localhost) by tom.home (8.15.2/8.15.2/Submit) id v27FWRUQ089554; Tue, 7 Mar 2017 17:32:27 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Tue, 7 Mar 2017 17:32:27 +0200 From: Konstantin Belousov To: Conrad Meyer Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r314677 - head/lib/libc/gen Message-ID: <20170307153227.GN30979@kib.kiev.ua> References: <201703042046.v24KkvTw062504@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201703042046.v24KkvTw062504@repo.freebsd.org> User-Agent: Mutt/1.8.0 (2017-02-23) X-Spam-Status: No, score=-2.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FREEMAIL_FROM,NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=3.4.1 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on tom.home X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Mar 2017 15:32:34 -0000 On Sat, Mar 04, 2017 at 08:46:57PM +0000, Conrad Meyer wrote: > Author: cem > Date: Sat Mar 4 20:46:57 2017 > New Revision: 314677 > URL: https://svnweb.freebsd.org/changeset/base/314677 > > Log: > fts: Fix a potential memory leak in error case > > Dan Krejsa reports a potential memory leak in an fts_build error case, > detected by Coverity. (It doesn't seem to show up in Coverity Scan, so I > don't have a CID to point to.) > > I don't know whether it is actually possible to arrive in this case with a > non-empty 'head' list. The cost is low, though. One additional branch in a > terminal error case isn't the end of the world. > > PR: 217125 > Submitted by: Dan Krejsa > > Modified: > head/lib/libc/gen/fts.c > > Modified: head/lib/libc/gen/fts.c > ============================================================================== > --- head/lib/libc/gen/fts.c Sat Mar 4 20:35:34 2017 (r314676) > +++ head/lib/libc/gen/fts.c Sat Mar 4 20:46:57 2017 (r314677) > @@ -850,6 +850,7 @@ mem1: saved_errno = errno; > (cur->fts_level == FTS_ROOTLEVEL ? > FCHDIR(sp, sp->fts_rfd) : > fts_safe_changedir(sp, cur->fts_parent, -1, ".."))) { > + fts_lfree(head); > cur->fts_info = FTS_ERR; > SET(FTS_STOP); > return (NULL); Shouldn't the same patch applied to fts-compat.c at line 872 ?