From owner-svn-src-all@freebsd.org Fri Dec 29 06:22:06 2017 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 723C4EACD5C; Fri, 29 Dec 2017 06:22:06 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (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 3FA107E1A9; Fri, 29 Dec 2017 06:22:06 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBT6M5IN051297; Fri, 29 Dec 2017 06:22:05 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBT6M5PZ051296; Fri, 29 Dec 2017 06:22:05 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201712290622.vBT6M5PZ051296@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Fri, 29 Dec 2017 06:22:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r327335 - head/sbin/fsdb X-SVN-Group: head X-SVN-Commit-Author: delphij X-SVN-Commit-Paths: head/sbin/fsdb X-SVN-Commit-Revision: 327335 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.25 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: Fri, 29 Dec 2017 06:22:06 -0000 Author: delphij Date: Fri Dec 29 06:22:05 2017 New Revision: 327335 URL: https://svnweb.freebsd.org/changeset/base/327335 Log: The fix in r327273 turns a memory leak into freeing wild pointer. Fix this by freeing only the initialized pointer. Modified: head/sbin/fsdb/fsdb.c Modified: head/sbin/fsdb/fsdb.c ============================================================================== --- head/sbin/fsdb/fsdb.c Fri Dec 29 05:01:07 2017 (r327334) +++ head/sbin/fsdb/fsdb.c Fri Dec 29 06:22:05 2017 (r327335) @@ -565,8 +565,10 @@ CMDFUNCSTART(findblk) end: curinum = ocurrent; curinode = ginode(curinum); - free(wantedblk32); - free(wantedblk64); + if (is_ufs2) + free(wantedblk64); + else + free(wantedblk32); return 0; }