forked from rpms/glibc
fb3d49c3bf
* Wed Nov 30 2022 Florian Weimer <fweimer@redhat.com> - 2.34-52 - Add noarch sysroot subpackages (#2149644) * Tue Nov 29 2022 Florian Weimer <fweimer@redhat.com> - 2.34-51 - Prepare for integration of GCC 8 compatible _Static_assert (#2149102) * Fri Nov 25 2022 Arjun Shankar <arjun@redhat.com> - 2.34-50 - Sync with upstream branch release/2.34/master, commit 405b8ae13540e9fd614df614e3361ebf9abd14cf: - elf: Fix wrong fscanf usage on tst-pldd - Allow for unpriviledged nested containers - elf: Fix wrong fscanf usage on tst-pldd - x86: Fix wcsnlen-avx2 page cross length comparison [BZ #29591] - elf: Fix rtld-audit trampoline for aarch64 Resolves: #2149102 Resolves: #2149644
27 lines
913 B
Diff
27 lines
913 B
Diff
commit 309c4708aca762f57263a66e5bea926fdbfd82eb
|
|
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
|
|
Date: Fri Mar 25 11:16:49 2022 -0300
|
|
|
|
elf: Fix wrong fscanf usage on tst-pldd
|
|
|
|
To take in consideration the extra '\0'.
|
|
|
|
Checked on x86_64-linux-gnu.
|
|
|
|
(cherry picked from commit b2cd93fce666fdc8c9a5c64af2741a8a6940ac99)
|
|
|
|
diff --git a/elf/tst-pldd.c b/elf/tst-pldd.c
|
|
index 210ca4d24b8338ab..72b7a99b369a105d 100644
|
|
--- a/elf/tst-pldd.c
|
|
+++ b/elf/tst-pldd.c
|
|
@@ -113,7 +113,8 @@ do_test (void)
|
|
TEST_VERIFY (out != NULL);
|
|
|
|
/* First line is in the form of <pid>: <full path of executable> */
|
|
- TEST_COMPARE (fscanf (out, "%u: " STRINPUT (512), &pid, buffer), 2);
|
|
+ TEST_COMPARE (fscanf (out, "%u: " STRINPUT (sizeof (buffer) - 1), &pid,
|
|
+ buffer), 2);
|
|
|
|
TEST_COMPARE (pid, *target_pid_ptr);
|
|
TEST_COMPARE (strcmp (basename (buffer), "tst-pldd"), 0);
|