From: Keith Packard <keithp@keithp.com>
To: newlib@sourceware.org
Subject: [PATCH 1/6] libm/stdlib: Recover from realloc failure when shrinking
Date: Thu, 20 Aug 2020 15:14:44 -0700 [thread overview]
Message-ID: <20200820221449.686006-2-keithp@keithp.com> (raw)
In-Reply-To: <20200820221449.686006-1-keithp@keithp.com>
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 <keithp@keithp.com>
---
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 6ba0eb74b..0b032d833 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 (old_size > size)
old_size = size;
--
2.28.0
next prev parent reply other threads:[~2020-08-20 22:14 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-20 22:14 [PATCH 0/6] Fixes inspired by building with clang Keith Packard
2020-08-20 22:14 ` Keith Packard [this message]
2020-08-20 22:14 ` [PATCH 2/6] libc/iconv: Check ces handlers table value in euc_from_ucs_init Keith Packard
2020-08-20 22:14 ` [PATCH 3/6] Avoid implicit floating point conversions Keith Packard
2020-08-20 22:43 ` Joseph Myers
[not found] ` <SN5P110MB03830A3D8272D82A089605659A5A0@SN5P110MB0383.NAMP110.PROD.OUTLOOK.COM>
2020-08-20 23:03 ` Fw: " C Howland
2020-08-21 0:01 ` Keith Packard
2020-08-20 22:14 ` [PATCH 4/6] libc/stdlib: Undefined shift negative value in a64l Keith Packard
2020-08-20 22:14 ` [PATCH 5/6] libc/stdlib: Clean up clang warnings Keith Packard
2020-08-20 22:14 ` [PATCH 6/6] libc/stdio: Conditionally declare vars for _FSEEK_OPTIMIZATION Keith Packard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200820221449.686006-2-keithp@keithp.com \
--to=keithp@keithp.com \
--cc=newlib@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).