public inbox for glibc-cvs@sourceware.org help / color / mirror / Atom feed
From: Adhemerval Zanella <azanella@sourceware.org> To: glibc-cvs@sourceware.org Subject: [glibc/release/2.34/master] catgets: Use 64 bit stat for __open_catalog (BZ# 29211) Date: Wed, 1 Jun 2022 16:57:48 +0000 (GMT) [thread overview] Message-ID: <20220601165748.D3024383B7AE@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=52431199b5cef8f56c71c66f5859b097804aebe8 commit 52431199b5cef8f56c71c66f5859b097804aebe8 Author: Adhemerval Zanella <adhemerval.zanella@linaro.org> Date: Tue May 31 12:38:55 2022 -0300 catgets: Use 64 bit stat for __open_catalog (BZ# 29211) This is a missing spot initially from 52a5fe70a2c77935. Checked on i686-linux-gnu. (cherry picked from commit c86631de6fa2fb5fa293810c66e53898537a4ddc) Diff: --- NEWS | 1 + catgets/open_catalog.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index ad6de8304f..70e561659a 100644 --- a/NEWS +++ b/NEWS @@ -107,6 +107,7 @@ The following bugs are resolved with this release: [29208] libc: fpathconf(_PC_ASYNC_IO) is not y2038 aware [29209] libc: isfdtype is not y2038 aware [29210] network: ruserpass is not y2038 aware + [29211] libc: __open_catalog is not y2038 aware \f Version 2.34 diff --git a/catgets/open_catalog.c b/catgets/open_catalog.c index 7f67cc0564..75703b2cad 100644 --- a/catgets/open_catalog.c +++ b/catgets/open_catalog.c @@ -40,7 +40,7 @@ __open_catalog (const char *cat_name, const char *nlspath, const char *env_var, __nl_catd catalog) { int fd = -1; - struct stat64 st; + struct __stat64_t64 st; int swapping; size_t cnt; size_t max_offset; @@ -194,7 +194,7 @@ __open_catalog (const char *cat_name, const char *nlspath, const char *env_var, return -1; } - if (__builtin_expect (__fstat64 (fd, &st), 0) < 0) + if (__glibc_unlikely (__fstat64_time64 (fd, &st) < 0)) goto close_unlock_return; if (__builtin_expect (!S_ISREG (st.st_mode), 0)
reply other threads:[~2022-06-01 16:57 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20220601165748.D3024383B7AE@sourceware.org \ --to=azanella@sourceware.org \ --cc=glibc-cvs@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: linkBe 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).