public inbox for newlib-cvs@sourceware.org
help / color / mirror / Atom feed
From: Corinna Vinschen <corinna@sourceware.org>
To: newlib-cvs@sourceware.org
Subject: [newlib-cygwin/main] newlib: libc: Fix memory leak in computematchjumps()
Date: Fri,  1 Dec 2023 18:29:41 +0000 (GMT)	[thread overview]
Message-ID: <20231201182941.635EE3858C2C@sourceware.org> (raw)

https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=65f7ab0bb928162f6a6ea60e2803d6b9e5d95e8b

commit 65f7ab0bb928162f6a6ea60e2803d6b9e5d95e8b
Author:     Kuan-Wei Chiu <visitorckw@gmail.com>
AuthorDate: Sat Dec 2 00:13:21 2023 +0800
Commit:     Corinna Vinschen <corinna@vinschen.de>
CommitDate: Fri Dec 1 19:28:55 2023 +0100

    newlib: libc: Fix memory leak in computematchjumps()
    
    In cases where malloc fails for the 'g->matchjump' allocation, the code
    path does not handle the failure gracefully, potentially leading to a
    memory leak. This fix ensures proper cleanup by freeing the allocated
    memory for 'pmatches' before returning.
    
    Signed-off-by: Kuan-Wei Chiu <visitorckw@gmail.com>

Diff:
---
 newlib/libc/posix/regcomp.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/newlib/libc/posix/regcomp.c b/newlib/libc/posix/regcomp.c
index 002f978cd07c..e71bc005c920 100644
--- a/newlib/libc/posix/regcomp.c
+++ b/newlib/libc/posix/regcomp.c
@@ -2001,8 +2001,10 @@ struct re_guts *g;
 	}
 
 	g->matchjump = (int*) malloc(g->mlen * sizeof(unsigned int));
-	if (g->matchjump == NULL)	/* Not a fatal error */
-		return;
+	if (g->matchjump == NULL) { /* Not a fatal error */
+        free(pmatches);
+        return;
+    }
 
 	/* Set maximum possible jump for each character in the pattern */
 	for (mindex = 0; mindex < g->mlen; mindex++)

                 reply	other threads:[~2023-12-01 18:29 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=20231201182941.635EE3858C2C@sourceware.org \
    --to=corinna@sourceware.org \
    --cc=newlib-cvs@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).