public inbox for newlib@sourceware.org
 help / color / mirror / Atom feed
From: "Pekka Seppänen" <pexu@sourceware.mail.kapsi.fi>
To: newlib@sourceware.org
Subject: [PATCH] libc/stdlib/nano-mallocr.c, typo in variable name
Date: Mon, 28 Aug 2023 14:02:20 +0300	[thread overview]
Message-ID: <1515662fc3254a75c831e4f0c02049b8@sourceware.mail.kapsi.fi> (raw)

Hi,

Nano malloc uses `size' in assertation whereas the correct variable 
would be `s'.  Given this has existed ever since nano malloc support was 
added, based on the context ("returned payload area of desired size does 
not exceed the actual allocated chunk") I presume that indeed `s' (user 
input) and not `r->size' (computed) shall be used.

---

diff --git a/newlib/libc/stdlib/nano-mallocr.c 
b/newlib/libc/stdlib/nano-mallocr.c
index a2b50facc..41e69abb0 100644
--- a/newlib/libc/stdlib/nano-mallocr.c
+++ b/newlib/libc/stdlib/nano-mallocr.c
@@ -396,7 +396,7 @@ void * nano_malloc(RARG malloc_size_t s)
          *(long *)((char *)r + offset) = -offset;
      }

-    assert(align_ptr + size <= (char *)r + alloc_size);
+    assert(align_ptr + s <= (char *)r + alloc_size);
      return align_ptr;
  }
  #endif /* DEFINE_MALLOC */

             reply	other threads:[~2023-08-28 11:02 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-08-28 11:02 Pekka Seppänen [this message]
2023-08-29 12:36 ` Corinna Vinschen

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=1515662fc3254a75c831e4f0c02049b8@sourceware.mail.kapsi.fi \
    --to=pexu@sourceware.mail.kapsi.fi \
    --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).