From: Siddhesh Poyarekar <siddhesh@sourceware.org>
To: libc-stable@sourceware.org
Cc: Arjun Shankar <arjun@redhat.com>
Subject: [committed 2.34 2/5] gconv_parseconfdir: Fix memory leak
Date: Wed, 4 Aug 2021 15:57:19 +0530 [thread overview]
Message-ID: <20210804102722.3103199-2-siddhesh@sourceware.org> (raw)
In-Reply-To: <20210804102722.3103199-1-siddhesh@sourceware.org>
The allocated `conf` would leak if we have to skip over the file due
to the underlying filesystem not supporting dt_type.
Reviewed-by: Arjun Shankar <arjun@redhat.com>
(cherry picked from commit 5f9b78fe35d08739b6da1e5b356786d41116c108)
---
iconv/gconv_parseconfdir.h | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/iconv/gconv_parseconfdir.h b/iconv/gconv_parseconfdir.h
index a4153e54c6..2f062689ec 100644
--- a/iconv/gconv_parseconfdir.h
+++ b/iconv/gconv_parseconfdir.h
@@ -153,12 +153,11 @@ gconv_parseconfdir (const char *dir, size_t dir_len)
struct stat64 st;
if (asprintf (&conf, "%s/%s", buf, ent->d_name) < 0)
continue;
- if (ent->d_type == DT_UNKNOWN
- && (lstat64 (conf, &st) == -1
- || !S_ISREG (st.st_mode)))
- continue;
- found |= read_conf_file (conf, dir, dir_len);
+ if (ent->d_type != DT_UNKNOWN
+ || (lstat64 (conf, &st) != -1 && S_ISREG (st.st_mode)))
+ found |= read_conf_file (conf, dir, dir_len);
+
free (conf);
}
}
--
2.31.1
next prev parent reply other threads:[~2021-08-04 10:27 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
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 ` Siddhesh Poyarekar [this message]
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
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=20210804102722.3103199-2-siddhesh@sourceware.org \
--to=siddhesh@sourceware.org \
--cc=arjun@redhat.com \
--cc=libc-stable@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).