public inbox for libc-stable@sourceware.org
 help / color / mirror / Atom feed
* [committed 2.34 1/5] ldconfig: avoid leak on empty paths in config file
@ 2021-08-04 10:27 Siddhesh Poyarekar
  2021-08-04 10:27 ` [committed 2.34 2/5] gconv_parseconfdir: Fix memory leak Siddhesh Poyarekar
                   ` (3 more replies)
  0 siblings, 4 replies; 5+ messages in thread
From: Siddhesh Poyarekar @ 2021-08-04 10:27 UTC (permalink / raw)
  To: libc-stable; +Cc: Arjun Shankar

Reviewed-by: Arjun Shankar <arjun@redhat.com>
(cherry picked from commit b0234d79e7d82475d1666f25326ec045c045b3ed)
---
 elf/ldconfig.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/elf/ldconfig.c b/elf/ldconfig.c
index 1037e8d0cf..b8893637f8 100644
--- a/elf/ldconfig.c
+++ b/elf/ldconfig.c
@@ -503,7 +503,11 @@ add_dir_1 (const char *line, const char *from_file, int from_line)
     entry->path[--i] = '\0';
 
   if (i == 0)
-    return;
+    {
+      free (entry->path);
+      free (entry);
+      return;
+    }
 
   char *path = entry->path;
   if (opt_chroot != NULL)
-- 
2.31.1


^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2021-08-04 10:27 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-04 10:27 [committed 2.34 1/5] ldconfig: avoid leak on empty paths in config file Siddhesh Poyarekar
2021-08-04 10:27 ` [committed 2.34 2/5] gconv_parseconfdir: Fix memory leak Siddhesh Poyarekar
2021-08-04 10:27 ` [committed 2.34 3/5] gaiconf_init: Avoid double-free in label and precedence lists Siddhesh Poyarekar
2021-08-04 10:27 ` [committed 2.34 4/5] copy_and_spawn_sgid: Avoid double calls to close() Siddhesh Poyarekar
2021-08-04 10:27 ` [committed 2.34 5/5] iconv_charmap: Close output file when done Siddhesh Poyarekar

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).