From nobody Mon Dec 25 14:26:05 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SzKvd3GnJz54nMw; Mon, 25 Dec 2023 14:26:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SzKvd2WdCz3NMf; Mon, 25 Dec 2023 14:26:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703514365; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HfVZf10DIUtAceeFrT5r0YYBPLdrihggRBCz1nf99kM=; b=CcAG4tGVduJDInj96gJiNgSzbKKFMPgpEAw67+nYLMKr3A6YLOs/H8bByGdQvAkbCQ8Esr bf7OGr446tkviZtfHn+0wZ9Bp7Xl21J7OHHUXhdgKciLhpXQO0Nug2L+zAqpy4913OG1qK 27UF3T2gQ9RFQfYwrPtfTPnzrZ3yN7NwSkKcln1hUiv6+HQF/jKmje1ydv6DgMZg0dcDmc vcch/jFwpq5fmfsKbjTORo99EehYUTAjCG24o3w7tJX8dD8WpafyFk4OHjrSr4RY6GTZkg wRiLmmKYg4P4BFHuaGEE05Xfjjl+1/8pgCKHctkn/i+RE4Z6ag+HVDhnuTc/9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703514365; a=rsa-sha256; cv=none; b=bG46vtl2gZzCjXoVaJSW06EqJA/88ekXkNmrQdiVuHYPPix/mvY59Er1ZieEBi+XWxBqT0 q1KmarhflpD5BGlweV6dBg8YZ09gQrleIhx/CWjeknpVA9a2oljIQIr4+1942z11+UlJlL WiDhNzOGJ+sB6236D3frf0rm9cPAhnWq97F5NU4+ppzaZupquXfETRlZIkl+I9roCA4KED Lx8CphI7uFw7a1qkfxJEzEY+uRWkePSJmaC5iExsOwOVI8bgNaj2JfNKr4iKS24mIwGBbF iRMsGn7lnO544OguKTHpmK0IdAYc0yUyxATENReN6sRu32HwB2rKhDTjIYz6Ig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703514365; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HfVZf10DIUtAceeFrT5r0YYBPLdrihggRBCz1nf99kM=; b=VvTbCqjp5SH/kF3325bI/Iv9/Sqy9ftdq54OItN2CDJJ6RlJZjpl9Greq9dUCgvyKZKYCF S06AVug3FqF/mBHCg/sEb3gSRoZRLBoIK/DRFA2cpdVSHJYWhmj6h5i8gNrU7bMQB2sZmL ItFExQVjy5CTLbJ2i5WVmeWAXRPNCOy90HiEXMbWcwyfraH9tk4O2TYpm9nUrUnycvMuMC WBS8jSXpcGwj1+oJsuPoRUpiG0BTYhw/8SNZygAyqcAsjfGoXQm5eMeqCC7sdzLMRPU4jn hq7rY/YcRWK4hcglRd6esD2xnoEXoTXl03RF/HHN5y7rGYbgAqI9CVXmyW7gUQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SzKvd1dJYz4v; Mon, 25 Dec 2023 14:26:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BPEQ5iH023985; Mon, 25 Dec 2023 14:26:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BPEQ5Sn023982; Mon, 25 Dec 2023 14:26:05 GMT (envelope-from git) Date: Mon, 25 Dec 2023 14:26:05 GMT Message-Id: <202312251426.3BPEQ5Sn023982@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: 691ff1832e09 - main - lib/libc/tests/string: add memrchr unit tests List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 691ff1832e09a6ccbc8f5b04c88cafc7452b3ce6 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=691ff1832e09a6ccbc8f5b04c88cafc7452b3ce6 commit 691ff1832e09a6ccbc8f5b04c88cafc7452b3ce6 Author: Robert Clausecker AuthorDate: 2023-12-06 09:11:40 +0000 Commit: Robert Clausecker CommitDate: 2023-12-25 13:59:58 +0000 lib/libc/tests/string: add memrchr unit tests The "values" test case is specifically crafted to detect the off-by-one error previous discovered in the scalar strchrnul implementation. Tested by: developers@, exp-run Approved by: mjg MFC after: 1 month MFC to: stable/14 PR: 275785 Differential Revision: https://reviews.freebsd.org/D42925 --- lib/libc/tests/string/Makefile | 1 + lib/libc/tests/string/memrchr_test.c | 116 +++++++++++++++++++++++++++++++++++ 2 files changed, 117 insertions(+) diff --git a/lib/libc/tests/string/Makefile b/lib/libc/tests/string/Makefile index a6e8eb18075a..4fce79685c0e 100644 --- a/lib/libc/tests/string/Makefile +++ b/lib/libc/tests/string/Makefile @@ -11,6 +11,7 @@ ATF_TESTS_C+= flsl_test ATF_TESTS_C+= flsll_test ATF_TESTS_C+= memccpy_test ATF_TESTS_C+= memcmp_test +ATF_TESTS_C+= memrchr_test ATF_TESTS_C+= memset_s_test ATF_TESTS_C+= strncmp_test ATF_TESTS_C+= stpncpy_test diff --git a/lib/libc/tests/string/memrchr_test.c b/lib/libc/tests/string/memrchr_test.c new file mode 100644 index 000000000000..12f696c9dc1e --- /dev/null +++ b/lib/libc/tests/string/memrchr_test.c @@ -0,0 +1,116 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2023 Robert Clausecker + */ + +#include + +#include +#include +#include + +#include + +static void *(*memrchr_fn)(const void *, int, size_t); + +ATF_TC_WITHOUT_HEAD(null); +ATF_TC_BODY(null, tc) +{ + ATF_CHECK_EQ(memrchr_fn(NULL, 42, 0), NULL); +} + +ATF_TC_WITHOUT_HEAD(not_found); +ATF_TC_BODY(not_found, tc) +{ + size_t i, j; + char buf[1+15+64+1]; /* offset [0..15] + 64 buffer bytes + sentinels */ + + buf[0] = 'X'; + memset(buf + 1, '-', sizeof(buf) - 1); + + for (i = 0; i < 16; i++) + for (j = 0; j < 64; j++) { + buf[i + j + 1] = 'X'; + ATF_CHECK_EQ(memrchr_fn(buf + i + 1, 'X', j), NULL); + buf[i + j + 1] = '-'; + } +} + +static void +do_found_test(char buf[], size_t len, size_t first, size_t second) +{ + /* invariant: first <= second */ + + buf[first] = 'X'; + buf[second] = 'X'; + ATF_CHECK_EQ(memrchr_fn(buf, 'X', len), buf + second); + buf[first] = '-'; + buf[second] = '-'; +} + +ATF_TC_WITHOUT_HEAD(found); +ATF_TC_BODY(found, tc) +{ + size_t i, j, k, l; + char buf[1+15+64+1]; + + buf[0] = 'X'; + memset(buf + 1, '-', sizeof(buf) - 1); + + for (i = 0; i < 16; i++) + for (j = 0; j < 64; j++) + for (k = 0; k < j; k++) + for (l = 0; l <= k; l++) { + buf[i + j + 1] = 'X'; + do_found_test(buf + i + 1, j, l, k); + buf[i + j + 1] = '-'; + } +} + +/* check that the right character is found */ +static void +do_values_test(unsigned char buf[], size_t len, size_t i, int c) +{ + /* sentinels */ + buf[-1] = c; + buf[len] = c; + memset(buf, c + 1, len); + + if (i < len) { + buf[i] = c; + ATF_CHECK_EQ(memrchr_fn(buf, c, len), buf + i); + } else + ATF_CHECK_EQ(memrchr_fn(buf, c, len), NULL); +} + +ATF_TC_WITHOUT_HEAD(values); +ATF_TC_BODY(values, tc) +{ + size_t i, j, k; + int c; + unsigned char buf[1+15+64+1]; + + for (i = 0; i < 16; i++) + for (j = 0; j < 64; j++) + for (k = 0; k <= j; k++) + for (c = 0; c <= UCHAR_MAX; c++) + do_values_test(buf + i + 1, j, k, c); +} + +ATF_TP_ADD_TCS(tp) +{ + void *dl_handle; + + dl_handle = dlopen(NULL, RTLD_LAZY); + memrchr_fn = dlsym(dl_handle, "test_memrchr"); + if (memrchr_fn == NULL) + memrchr_fn = memrchr; + + ATF_TP_ADD_TC(tp, null); + ATF_TP_ADD_TC(tp, not_found); + ATF_TP_ADD_TC(tp, found); + ATF_TP_ADD_TC(tp, values); + + return (atf_no_error()); +}