From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2206) id 97BB83858C2F; Thu, 22 Jun 2023 04:53:36 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 97BB83858C2F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1687409616; bh=+qDxnrRVHUXoQmevwzHE4Ik5i0KXgA7l/DZXK1mJ5/I=; h=From:To:Subject:Date:From; b=FHAtlqo+E7w5YZVJ8qNtmwzroCJPmjQcyLAssHK0WEtUzELLpqau+4uh0Kj2bUiY4 vxTzhzdJce1u+iK4xy80wJNASJuE04q0cN6h7IC/534D/suEdcFKCVQwvw3uKxBAr9 2NDfwPEfS0ZrnoLCD7GnL9EbaYdt92C91+8UIA5o= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Siddhesh Poyarekar To: glibc-cvs@sourceware.org Subject: [glibc] stdio-common: tests: Incorrect maxlen parameter for swprintf X-Act-Checkin: glibc X-Git-Author: Frederic Berat X-Git-Refname: refs/heads/master X-Git-Oldrev: 1bc85effd549ae42318b37555a4c76ebc479b92a X-Git-Newrev: 427dbaee86bcec31ba2fe9a42f32842cf17c4e77 Message-Id: <20230622045336.97BB83858C2F@sourceware.org> Date: Thu, 22 Jun 2023 04:53:36 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=427dbaee86bcec31ba2fe9a42f32842cf17c4e77 commit 427dbaee86bcec31ba2fe9a42f32842cf17c4e77 Author: Frederic Berat Date: Tue Jun 20 20:18:53 2023 +0200 stdio-common: tests: Incorrect maxlen parameter for swprintf Few tests using swprintf are passing incorrect maxlen parameter. This triggers an abort when _FORTIFY_SOURCE is enabled. Reviewed-by: Siddhesh Poyarekar Diff: --- stdio-common/tst-printf-bz25691.c | 8 ++++---- stdio-common/tst-vfprintf-mbs-prec.c | 15 ++++++++------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/stdio-common/tst-printf-bz25691.c b/stdio-common/tst-printf-bz25691.c index db81fdf590..44e9ea7d9d 100644 --- a/stdio-common/tst-printf-bz25691.c +++ b/stdio-common/tst-printf-bz25691.c @@ -78,12 +78,12 @@ do_test (void) wchar_t *result = xmalloc (resultsize); int ret; - ret = swprintf (result, resultsize, L"%.65537s", mbs); + ret = swprintf (result, mbssize, L"%.65537s", mbs); TEST_COMPARE (ret, mbssize - 1); TEST_COMPARE_BLOB (result, (ret + 1) * sizeof (wchar_t), expected, expectedsize * sizeof (wchar_t)); - ret = swprintf (result, resultsize, L"%1$.65537s", mbs); + ret = swprintf (result, mbssize, L"%1$.65537s", mbs); TEST_COMPARE (ret, mbssize - 1); TEST_COMPARE_BLOB (result, (ret + 1) * sizeof (wchar_t), expected, expectedsize * sizeof (wchar_t)); @@ -91,10 +91,10 @@ do_test (void) /* Same test, but with an invalid multibyte sequence. */ mbs[mbssize - 2] = 0xff; - ret = swprintf (result, resultsize, L"%.65537s", mbs); + ret = swprintf (result, mbssize, L"%.65537s", mbs); TEST_COMPARE (ret, -1); - ret = swprintf (result, resultsize, L"%1$.65537s", mbs); + ret = swprintf (result, mbssize, L"%1$.65537s", mbs); TEST_COMPARE (ret, -1); free (mbs); diff --git a/stdio-common/tst-vfprintf-mbs-prec.c b/stdio-common/tst-vfprintf-mbs-prec.c index 38350ed60f..41c4139f21 100644 --- a/stdio-common/tst-vfprintf-mbs-prec.c +++ b/stdio-common/tst-vfprintf-mbs-prec.c @@ -441,7 +441,8 @@ test_mbs_long (const char *mbs, const wchar_t *wide, const size_t *length) static void test_wide_long (const char *mbs, const wchar_t *wide, const size_t *length) { - wchar_t buf[2000]; +#define BUF_SIZE 2000 + wchar_t buf[BUF_SIZE]; _Static_assert (sizeof (buf) > sizeof (wchar_t) * WIDE_STRING_LENGTH, "buffer size consistent with string length"); const wchar_t *suffix = L"||TERM"; @@ -450,13 +451,13 @@ test_wide_long (const char *mbs, const wchar_t *wide, const size_t *length) /* Test formatting of the entire string. */ { - int ret = swprintf (buf, sizeof (buf), L"%s%ls", mbs, suffix); + int ret = swprintf (buf, BUF_SIZE, L"%s%ls", mbs, suffix); TEST_VERIFY (ret == WIDE_STRING_LENGTH + wcslen (suffix)); TEST_VERIFY (wmemcmp (buf, wide, WIDE_STRING_LENGTH) == 0); TEST_VERIFY (wcscmp (buf + WIDE_STRING_LENGTH, suffix) == 0); /* Left-justified string, printed in full. */ - ret = swprintf (buf, sizeof (buf), L"%-1500s%ls", mbs, suffix); + ret = swprintf (buf, BUF_SIZE, L"%-1500s%ls", mbs, suffix); TEST_VERIFY (ret == 1500 + wcslen (suffix)); TEST_VERIFY (wmemcmp (buf, wide, WIDE_STRING_LENGTH) == 0); for (size_t i = WIDE_STRING_LENGTH; i < 1500; ++i) @@ -464,7 +465,7 @@ test_wide_long (const char *mbs, const wchar_t *wide, const size_t *length) TEST_VERIFY (wcscmp (buf + 1500, suffix) == 0); /* Right-justified string, printed in full. */ - ret = swprintf (buf, sizeof (buf), L"%1500s%ls", mbs, suffix); + ret = swprintf (buf, BUF_SIZE, L"%1500s%ls", mbs, suffix); TEST_VERIFY (ret == 1500 + wcslen (suffix)); size_t padding = 1500 - WIDE_STRING_LENGTH; for (size_t i = 0; i < padding; ++i) @@ -484,14 +485,14 @@ test_wide_long (const char *mbs, const wchar_t *wide, const size_t *length) printf ("info: %s: wide_len=%d actual_wide_len=%zu\n", __func__, wide_len, actual_wide_len); - int ret = swprintf (buf, sizeof (buf), L"%.*s%ls", + int ret = swprintf (buf, BUF_SIZE, L"%.*s%ls", wide_len, mbs, suffix); TEST_VERIFY (ret == actual_wide_len + wcslen (suffix)); TEST_VERIFY (wmemcmp (buf, wide, actual_wide_len) == 0); TEST_VERIFY (wcscmp (buf + actual_wide_len, suffix) == 0); /* Left-justified string, printed in full. */ - ret = swprintf (buf, sizeof (buf), L"%-1500.*s%ls", + ret = swprintf (buf, BUF_SIZE, L"%-1500.*s%ls", wide_len, mbs, suffix); TEST_VERIFY (ret == 1500 + wcslen (suffix)); TEST_VERIFY (wmemcmp (buf, wide, actual_wide_len) == 0); @@ -500,7 +501,7 @@ test_wide_long (const char *mbs, const wchar_t *wide, const size_t *length) TEST_VERIFY (wcscmp (buf + 1500, suffix) == 0); /* Right-justified string, printed in full. */ - ret = swprintf (buf, sizeof (buf), L"%1500.*s%ls", + ret = swprintf (buf, BUF_SIZE, L"%1500.*s%ls", wide_len, mbs, suffix); TEST_VERIFY (ret == 1500 + wcslen (suffix)); size_t padding = 1500 - actual_wide_len;