From nobody Mon Dec 23 19:13:55 2024 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 4YH73l4bJqz5hH1Z; Mon, 23 Dec 2024 19:13:55 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YH73l2TmDz40pf; Mon, 23 Dec 2024 19:13:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734981235; 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=PWnnV7AjAzEBycvdPeIhzh5wGRlhz2XteHjrBi/PA3g=; b=uRhx2KsPgB976A9lPeOKsFWbROueQNuhKUKyL4vwpDqkAC3m4oApzotfGPoMS4jlCy1Ez9 hzTeM62CYGzBk207DYAClAv03Dx8MmH4LNqOYsUtomSyWb0pnXQD2/q0DWvUFS4NtScO11 BCzlPJyN8WzVTEsJYKm8JJv1rhW5Dlu32thH78+g0gQJA8HPnvWb5x2U1pjqzHa6cKNgb4 rFfMCGrJ2GPSbtJd0KV0yrwTjX5BeoQ/3dY7r9DGCYc7FoIGY5SIFrSjy6P647T//WaRvb /ygvP5dQO3Axpp19+VsYNwiMCQ0weNnU6dolgLT9dojAiGV7lNL0OBPD1eU1FA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734981235; 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=PWnnV7AjAzEBycvdPeIhzh5wGRlhz2XteHjrBi/PA3g=; b=apt/xR2OZ0KNxIwbpaOZbQ6SN5ujOyOGznXzMIamMOSwyKPNi1ojcw+Cb1Hyk4WM+KycJv Fl4PnnqJLJ1dGkh6XyafZd6vr64Nq5wZ9IwH+XbitcGMx2UluCK6HThUUBqYHbzqO+e5ON AG2wx+yFzWqGfraDpLcGdHLYJGrN30fc1m69YaYOD4nS57UmeR7Yx6B0Ekty5N6GO4Q+RA Vifyhf3cNAqJxDD1icB/0Peq26J7hizl9OVh5H2+DG88S7JCzGYz7UA12wJ7I2WZoxc/4m spbQEcxt5T3vLOX8mHzaRRwVKNc5iB5zHfZgue+KJA9Va8oRIehJdYwkPIumFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734981235; a=rsa-sha256; cv=none; b=xiVYBUGW3KgbJFu+EiLoM2MXdIg8SS0ISFJaNdAWhiNyrMJyDzY79gnVqjQprxjB4640Tl hT+bNbuLb/EcUP6lm9pihZ+4H7eGaV1fesnOXo/21lhP0WFBGSFKYIZ/sFHaNPoFJPiXGu HR86TlMiFWYuYX8/TPmrIdXX0LzF06dURtDGdGR9lBUZc/fGeKpABvK8wUQHrDgme9Dcmn tJp+8i6uuzB2Z9T1mjqmQbuf8tZLQHjmS+NkpMwT9lDP/vY0kSCoADhXsY734Gp/VKjj3z Aw/3N0+3fXHy81JNKrHKGhEjNxTBvEs/IhvEODVa6maw4x7uh337Xc05cI+PMw== 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 4YH73l25g6z15kx; Mon, 23 Dec 2024 19:13:55 +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 4BNJDtHR003689; Mon, 23 Dec 2024 19:13:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BNJDtMc003686; Mon, 23 Dec 2024 19:13:55 GMT (envelope-from git) Date: Mon, 23 Dec 2024 19:13:55 GMT Message-Id: <202412231913.4BNJDtMc003686@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 5982237f1e5a - main - sed: Fix handling of an empty pattern space 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 5982237f1e5a30b6b7d67b307b4d3685b00718bf Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=5982237f1e5a30b6b7d67b307b4d3685b00718bf commit 5982237f1e5a30b6b7d67b307b4d3685b00718bf Author: Mohamed Akram AuthorDate: 2024-12-23 19:06:09 +0000 Commit: Mark Johnston CommitDate: 2024-12-23 19:07:14 +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 --- 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 d06dc09542e1..c177524a528a 100644 --- a/usr.bin/sed/process.c +++ b/usr.bin/sed/process.c @@ -436,14 +436,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 }