| commit 5f9b78fe35d08739b6da1e5b356786d41116c108 |
| Author: Siddhesh Poyarekar <siddhesh@sourceware.org> |
| Date: Tue Aug 3 21:10:20 2021 +0530 |
| |
| gconv_parseconfdir: Fix memory leak |
| |
| 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> |
| |
| diff --git a/iconv/gconv_parseconfdir.h b/iconv/gconv_parseconfdir.h |
| index 915b60845ca11c03..e4c3c16d1f96ce0c 100644 |
| |
| |
| @@ -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); |
| } |
| } |