public inbox for glibc-cvs@sourceware.org help / color / mirror / Atom feed
From: Arjun Shankar <arjun@sourceware.org> To: glibc-cvs@sourceware.org Subject: [glibc/release/2.35/master] elf: Fix wrong fscanf usage on tst-pldd Date: Fri, 25 Nov 2022 14:31:15 +0000 (GMT) [thread overview] Message-ID: <20221125143115.1CFF438532EF@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=cad7947db7f464506773a10aa88655ce2d9cf9a0 commit cad7947db7f464506773a10aa88655ce2d9cf9a0 Author: Adhemerval Zanella <adhemerval.zanella@linaro.org> Date: Tue Jul 5 12:58:40 2022 -0300 elf: Fix wrong fscanf usage on tst-pldd The fix done b2cd93fce666fdc8c9a5c64af2741a8a6940ac99 does not really work since macro strification does not expand the sizeof nor the arithmetic operation. Checked on x86_64-linux-gnu. (cherry picked from commit c353689e49e72f3aafa1a9e68d4f7a4f33a79cbe) Diff: --- elf/tst-pldd.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/elf/tst-pldd.c b/elf/tst-pldd.c index 0616545b1d..9f633d41a2 100644 --- a/elf/tst-pldd.c +++ b/elf/tst-pldd.c @@ -108,15 +108,16 @@ do_test (void) loader and libc. */ { pid_t pid; - char buffer[512]; -#define STRINPUT(size) "%" # size "s" +#define BUFFERLEN 511 + char buffer[BUFFERLEN + 1]; +#define STRINPUT(size) XSTRINPUT(size) +#define XSTRINPUT(size) "%" # size "s" FILE *out = fmemopen (pldd.out.buffer, pldd.out.length, "r"); TEST_VERIFY (out != NULL); /* First line is in the form of <pid>: <full path of executable> */ - TEST_COMPARE (fscanf (out, "%u: " STRINPUT (sizeof (buffer) - 1), &pid, - buffer), 2); + TEST_COMPARE (fscanf (out, "%u: " STRINPUT (BUFFERLEN), &pid, buffer), 2); TEST_COMPARE (pid, *target_pid_ptr); TEST_COMPARE (strcmp (basename (buffer), "tst-pldd"), 0);
next reply other threads:[~2022-11-25 14:31 UTC|newest] Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-11-25 14:31 Arjun Shankar [this message] -- strict thread matches above, loose matches on Subject: below -- 2022-11-25 14:31 Arjun Shankar
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=20221125143115.1CFF438532EF@sourceware.org \ --to=arjun@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).