From nobody Tue Jan 14 14:43:30 2025 X-Original-To: dev-commits-src-branches@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 4YXX1Z5DpSz5km0Q; Tue, 14 Jan 2025 14:43:30 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YXX1Z4N5kz3gPg; Tue, 14 Jan 2025 14:43:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736865810; 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=TCRezlNRJ/QnvR6wuZOIfeWx1zydso6DSsRtBll48iE=; b=ttvkrPZQa0CmcaAuSFcKJAxxzkyK2aA38GRuzWAJLOSjwAAJB1nKQYjD9WnOCwPbH7tw59 XuXtA13byKMK/0v4yYZR6psT5zcnUhdlprQJAoyo6okrVJybKD4V632zyAnKSpgUKgV6ES u8BlMB392gGhA/+zmmSmmxQJtRH6wzWqoki3DREFqmmxKKIbwgxYnIxXEDgLNDt88QNZzj iW9ytQ196wWVnLsyhN7C35pr+ZULcPdD3eM86xJCjvCdRdtjnB9w3a5D8kINe0Fylx+2Vv JVBIhTpJWi7BWMA0e6hcP5DrqZiW9myzLrFeQRPfYXYkXVoqwqtV9DQMCEqJgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736865810; 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=TCRezlNRJ/QnvR6wuZOIfeWx1zydso6DSsRtBll48iE=; b=eHv915zTcSwIo+XZt7Q52cKW2eAa677Z7wMnBtjbuySM3gT/5gpRYkluJlsb43+b03OjkZ nkl8Q/wp4mM5SAXhBI8hWQvqmVq+bQrrzzqlGvHNREWmdJozZgZNtKOTOzaULJ7Atk68dp JcHFlkVBf8Wsj9GJxhszs7cQ8VmuQPm/4s0FyIHJBhTz2L0Puujam6AKmi61vwrHEx50x9 3uaXmTaMRYxqrZncA04d7bdIrhVNvO7GXOeYrDi/fiUAQrJaJHTGvJBbK1xY/h6/DTCuUh s8FfUEyvDnaOL34eVfiaaAw7yTaIib/BzX3AC+8UXj8BpglGdhaZyMOQE6v86Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736865810; a=rsa-sha256; cv=none; b=oKdf4Kk3MQDtbT0BI6mq5a6DimsnlWhZcxYOpAw9CgmpOkI69jpAfgXkhTMOHXp4Gj+GLN pbwUu/qkSHHAeooqtcXWTf2JS+qr9CZRLr/TigGk6xelKjzKp6Nk3xwVhktrX7kP0DlWAH y7FP4n+Rol+Nd9OLRtWmsVU4BVQB6WHfqkuPzNOrZzmwsId+h8GeqrRy/ZmoX3F2zo6XmH RHmnUChBSTF1jDLLMl2DenT99QIuE9pkyO8Rdlz9enVSch8mdr5KG8yN0mLJ8YHMu3VrAS Dgzy1r0CEkuU5Li1LkJN7Sp5DxsjgNq1cK0ZYJCekuSWlw0eLwAecB4FvoBi2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YXX1Z3rPMz1Kgj; Tue, 14 Jan 2025 14:43:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50EEhUtO013998; Tue, 14 Jan 2025 14:43:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50EEhUeo013995; Tue, 14 Jan 2025 14:43:30 GMT (envelope-from git) Date: Tue, 14 Jan 2025 14:43:30 GMT Message-Id: <202501141443.50EEhUeo013995@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 2c1c6bd7d5db - stable/14 - sed: Fix handling of an empty pattern space List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2c1c6bd7d5dbddd953587c1f003e6164749e087b Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=2c1c6bd7d5dbddd953587c1f003e6164749e087b commit 2c1c6bd7d5dbddd953587c1f003e6164749e087b Author: Mohamed Akram AuthorDate: 2024-12-23 19:06:09 +0000 Commit: Mark Johnston CommitDate: 2025-01-14 14:14:24 +0000 sed: Fix handling of an empty pattern space Add a regression test. PR: 271791 Obtained from: OpenBSD (1.38 millert) MFC after: 2 weeks (cherry picked from commit 5982237f1e5a30b6b7d67b307b4d3685b00718bf) --- usr.bin/sed/process.c | 10 ++++------ usr.bin/sed/tests/sed2_test.sh | 14 ++++++++++++++ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/usr.bin/sed/process.c b/usr.bin/sed/process.c index 3d88096ffb77..945db462a601 100644 --- a/usr.bin/sed/process.c +++ b/usr.bin/sed/process.c @@ -439,14 +439,12 @@ substitute(struct s_command *cp) * and at the end of the line, terminate. */ if (match[0].rm_so == match[0].rm_eo) { - if (*s == '\0' || *s == '\n') - slen = -1; - else - slen--; - if (*s != '\0') { + if (slen > 0) { cspace(&SS, s++, 1, APPEND); + slen--; le++; - } + } else + slen = -1; lastempty = 1; } else lastempty = 0; diff --git a/usr.bin/sed/tests/sed2_test.sh b/usr.bin/sed/tests/sed2_test.sh index f50619612561..0b849b1ea132 100755 --- a/usr.bin/sed/tests/sed2_test.sh +++ b/usr.bin/sed/tests/sed2_test.sh @@ -159,6 +159,19 @@ minus_e_body() atf_check -o 'inline:--\nab\n' sed $'1 i\\\n--' a } +atf_test_case command_D +command_D_head() +{ + atf_set "descr" "Test handling of an empty pattern space" +} +command_D_body() +{ + printf "hello\n\nworld\n" > a + + atf_check -o file:a sed -e 's/^//;P;D' a + atf_check -o file:a sed -e 's/^//;$!N;P;D' a +} + atf_init_test_cases() { atf_add_test_case inplace_command_q @@ -169,4 +182,5 @@ atf_init_test_cases() atf_add_test_case hex_subst atf_add_test_case bracket_y atf_add_test_case minus_e + atf_add_test_case command_D }