aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Johnston <markj@FreeBSD.org>2021-07-29 13:14:50 +0000
committerMark Johnston <markj@FreeBSD.org>2021-08-05 12:45:22 +0000
commitd88815784447d24216bafeefa973da4e0ae5db14 (patch)
treeabf1ac077abfdddfbc9774cd4cd924b5a9cb4fcc
parent7809becb4ea614b1a978cd60e7ce7b68d459391b (diff)
downloadsrc-d88815784447d24216bafeefa973da4e0ae5db14.tar.gz
src-d88815784447d24216bafeefa973da4e0ae5db14.zip
libc/locale: Use O_CLOEXEC when opening locale tables
Reviewed by: kib Sponsored by: The FreeBSD Foundation (cherry picked from commit 98bfb9dac28585fb5629c5fc951ce0d83490d446)
-rw-r--r--lib/libc/locale/collate.c2
-rw-r--r--lib/libc/locale/rune.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/libc/locale/collate.c b/lib/libc/locale/collate.c
index c992d2299ab7..7afb2043e6a4 100644
--- a/lib/libc/locale/collate.c
+++ b/lib/libc/locale/collate.c
@@ -131,7 +131,7 @@ __collate_load_tables_l(const char *encoding, struct xlocale_collate *table)
if (asprintf(&buf, "%s/%s/LC_COLLATE", _PathLocale, encoding) == -1)
return (_LDP_ERROR);
- if ((fd = _open(buf, O_RDONLY)) < 0) {
+ if ((fd = _open(buf, O_RDONLY | O_CLOEXEC)) < 0) {
free(buf);
return (_LDP_ERROR);
}
diff --git a/lib/libc/locale/rune.c b/lib/libc/locale/rune.c
index b7334636f654..ce2095763eba 100644
--- a/lib/libc/locale/rune.c
+++ b/lib/libc/locale/rune.c
@@ -74,7 +74,7 @@ _Read_RuneMagi(const char *fname)
int runetype_ext_len = 0;
int fd;
- if ((fd = _open(fname, O_RDONLY)) < 0) {
+ if ((fd = _open(fname, O_RDONLY | O_CLOEXEC)) < 0) {
errno = EINVAL;
return (NULL);
}