From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 61450 invoked by alias); 2 May 2019 12:41:16 -0000 Mailing-List: contact libc-stable-help@sourceware.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Subscribe: List-Archive: Sender: libc-stable-owner@sourceware.org Received: (qmail 61435 invoked by uid 89); 2 May 2019 12:41:15 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Checked: by ClamAV 0.100.3 on sourceware.org X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,SPF_PASS autolearn=ham version=3.3.1 spammy=HX-Languages-Length:1258, integrity X-Spam-Status: No, score=-26.9 required=5.0 tests=BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,SPF_PASS autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on sourceware.org X-Spam-Level: X-HELO: aloka.lostca.se Received: from aloka.lostca.se (HELO aloka.lostca.se) (178.63.46.202) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 02 May 2019 12:41:14 +0000 Received: from aloka.lostca.se (aloka [127.0.0.1]) by aloka.lostca.se (Postfix) with ESMTP id 9520E2E1C for ; Thu, 2 May 2019 12:41:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=lostca.se; h=date:from:to :subject:message-id:mime-version:content-type; s=howrah; bh=YKdA z3ytn1OCEDUQsKuv87Z6qPg=; b=w276KN6Yi4GPpgrwGjlssnO+sqYl4hipGrlW hF6TDwBhQAEvw6d53KofkBHlvR2Jk65Wd57mP4RmUX7yARnGjkdU75APOQhtycPI J6nUp2tiJjBNF4vNrbT25YXWuBIEMVV+9JVfST398XJMsimXjhoYuXOdH4bXtZUG evvi27c= Received: from localhost (unknown [IPv6:2a01:4f8:120:624c::25]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aloka.lostca.se (Postfix) with ESMTPSA id 580CF2E1B for ; Thu, 2 May 2019 12:41:12 +0000 (UTC) Date: Tue, 01 Jan 2019 00:00:00 -0000 From: Arjun Shankar To: libc-stable@sourceware.org Subject: [2.28 COMMITTED] malloc: Add ChangeLog for accidentally committed change Message-ID: <20190502124111.GA16742@aloka.lostca.se> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) X-IsSubscribed: yes X-SW-Source: 2019-05/txt/msg00001.txt.bz2 Commit b90ddd08f6dd688e651df9ee89ca3a69ff88cd0c ("malloc: Additional checks for unsorted bin integrity I.") was committed without a whitespace fix, so it is adjusted here as well. (cherry picked from commit 35cfefd96062145eeb8aee6bd72d07e0909a6b2e) --- ChangeLog | 4 ++++ malloc/malloc.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 63917cc15d..c42b55f72f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2018-08-17 Istvan Kurucsai + + * malloc/malloc.c (_int_malloc): Additional binning code checks. + 2019-04-23 Adhemerval Zanella [BZ #18035] diff --git a/malloc/malloc.c b/malloc/malloc.c index 27cf6137c2..520a4faa7c 100644 --- a/malloc/malloc.c +++ b/malloc/malloc.c @@ -3738,7 +3738,7 @@ _int_malloc (mstate av, size_t bytes) if (__glibc_unlikely (bck->fd != victim) || __glibc_unlikely (victim->fd != unsorted_chunks (av))) malloc_printerr ("malloc(): unsorted double linked list corrupted"); - if (__glibc_unlikely (prev_inuse(next))) + if (__glibc_unlikely (prev_inuse (next))) malloc_printerr ("malloc(): invalid next->prev_inuse (unsorted)"); /* -- 2.20.1