From 3f54e459a633b4247be91b9d0f68a7e08720b8d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20B=C3=A9rat?= Date: Tue, 13 Aug 2024 12:01:26 +0200 Subject: [PATCH] libio/tst-getdelim: Add new test covering NUL as a delimiter Add a new test to getdelim to verify that '\0' can be set as a delimiter. Reviewed-by: Florian Weimer --- libio/tst-getdelim.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/libio/tst-getdelim.c b/libio/tst-getdelim.c index e6dd964b49..db15bf9285 100644 --- a/libio/tst-getdelim.c +++ b/libio/tst-getdelim.c @@ -1,4 +1,6 @@ -/* Check that getdelim sets error indicator on error (BZ #29917) +/* Test getdelim conforming to POSIX specifications. + + Note: Most getdelim use cases are covered by stdio-common/tst-getline. Copyright (C) 2023-2024 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -18,18 +20,36 @@ . */ #include +#include #include #include +#include +#include static int do_test (void) { + /* Check that getdelim sets error indicator on error (BZ #29917) */ clearerr (stdin); TEST_VERIFY (getdelim (0, 0, '\n', stdin) == -1); TEST_VERIFY (ferror (stdin) != 0); TEST_VERIFY (errno == EINVAL); + /* Test getdelim with NUL as delimiter */ + verbose_printf ("Testing NUL delimiter\n"); + char *lineptr = NULL; + size_t linelen = 0; + char membuf[] = "abc\0d\nef\0"; + FILE *memstream = fmemopen (membuf, sizeof (membuf), "r"); + TEST_VERIFY_EXIT (memstream != NULL); + TEST_VERIFY (getdelim (&lineptr, &linelen, '\0', memstream) != -1); + TEST_COMPARE_BLOB (lineptr, 4, "abc\0", 4); + TEST_VERIFY (getdelim (&lineptr, &linelen, '\0', memstream) != -1); + TEST_COMPARE_BLOB (lineptr, 5, "d\nef\0", 5); + fclose (memstream); + free (lineptr); + return 0; }