forked from rpms/glibc
27 lines
742 B
Diff
27 lines
742 B
Diff
|
commit 0b03996304f86d6dba8f0d4b7048b9bb7186f17d
|
||
|
|
Author: Siddhesh Poyarekar <siddhesh@sourceware.org>
|
||
|
|
Date: Tue Aug 3 21:10:10 2021 +0530
|
||
|
|
|
||
|
|
ldconfig: avoid leak on empty paths in config file
|
||
|
|
|
||
|
|
Reviewed-by: Arjun Shankar <arjun@redhat.com>
|
||
|
|
(cherry picked from commit b0234d79e7d82475d1666f25326ec045c045b3ed)
|
||
|
|
|
||
|
|
diff --git a/elf/ldconfig.c b/elf/ldconfig.c
|
||
|
|
index 1037e8d0cf8d28b6..b8893637f8aaea8d 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)
|