From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from elaine.keithp.com (home.keithp.com [63.227.221.253]) by sourceware.org (Postfix) with ESMTPS id ECD66385701E for ; Tue, 11 Aug 2020 23:05:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org ECD66385701E Received: from localhost (localhost [127.0.0.1]) by elaine.keithp.com (Postfix) with ESMTP id 02D7A3F2CAE2 for ; Tue, 11 Aug 2020 16:05:48 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at keithp.com Received: from elaine.keithp.com ([127.0.0.1]) by localhost (elaine.keithp.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id fZeVDZTkUTqJ; Tue, 11 Aug 2020 16:05:47 -0700 (PDT) Received: from keithp.com (koto.keithp.com [10.0.0.2]) by elaine.keithp.com (Postfix) with ESMTPSA id 4C3B33F2CA7B; Tue, 11 Aug 2020 16:05:47 -0700 (PDT) Received: by keithp.com (Postfix, from userid 1000) id 30CCD15822A5; Tue, 11 Aug 2020 16:05:47 -0700 (PDT) From: Keith Packard To: newlib@sourceware.org Subject: [PATCH 4/4] libm/stdlib: Recover from realloc failure when shrinking Date: Tue, 11 Aug 2020 16:05:43 -0700 Message-Id: <20200811230543.2169774-5-keithp@keithp.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200811230543.2169774-1-keithp@keithp.com> References: <20200811230543.2169774-1-keithp@keithp.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-10.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: newlib@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Newlib mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Aug 2020 23:05:50 -0000 When shrinking and the new allocation fails, just leave things as they were and keep going. Applications may well expect shrinking reallocations to always succeed. Signed-off-by: Keith Packard --- newlib/libc/stdlib/nano-mallocr.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/newlib/libc/stdlib/nano-mallocr.c b/newlib/libc/stdlib/nano-mallocr.c index 83234c618..452d1448a 100644 --- a/newlib/libc/stdlib/nano-mallocr.c +++ b/newlib/libc/stdlib/nano-mallocr.c @@ -481,7 +481,12 @@ void * nano_realloc(RARG void * ptr, malloc_size_t size) return ptr; mem = nano_malloc(RCALL size); - if (mem != NULL) + if (mem == NULL) + { + if (size <= old_size) + return ptr; + } + else { if (size > old_size) size = old_size; -- 2.28.0