diff --git a/NEWS b/NEWS index de4b8ee..74f3d7e 100644 --- a/NEWS +++ b/NEWS @@ -14,6 +14,9 @@ GNU sed NEWS -*- outline -*- sed no longer accesses invalid memory (heap overflow) when given invalid backreferences in 's' command [bug#32082, present at least since sed-4.0.6]. + sed no longer adds extraneous NUL when given s/$//n command. + [related to bug#32271, present since sed-4.0.7] + * Noteworthy changes in release 4.5 (2018-03-31) [stable] diff --git a/sed/execute.c b/sed/execute.c index 1cc1d3f..c1d656a 100644 --- a/sed/execute.c +++ b/sed/execute.c @@ -1050,7 +1050,10 @@ do_subst(struct subst *sub) /* Copy stuff to the left of this match into the output string. */ if (start < offset) - str_append(&s_accum, line.active + start, offset - start); + { + str_append(&s_accum, line.active + start, offset - start); + start = offset; + } /* If we're counting up to the Nth match, are we there yet? And even if we are there, there is another case we have to diff --git a/testsuite/bug32271-1.sh b/testsuite/bug32271-1.sh new file mode 100755 index 0000000..df2e308 --- /dev/null +++ b/testsuite/bug32271-1.sh @@ -0,0 +1,45 @@ +#!/bin/sh +# sed would incorrectly copy internal buffers under certain s/// uses. +# Before sed 4.6 these would result in an extraneous NUL at end of lines. +# + +# Copyright (C) 2018 Free Software Foundation, Inc. + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +. "${srcdir=.}/testsuite/init.sh"; path_prepend_ ./sed +print_ver_ sed + +printf '0\n' > in || framework_failure_ +printf '0\n' > exp || framework_failure_ + +# Before sed 4.6, this would result in: 0x30 0x00 0x0a. +sed -e 's/$/a/2' in > out 2> err || fail=1 + +compare exp out || fail=1 +compare /dev/null err || fail=1 + +# To ease debugging / error reporting (the above 'compare' +# will report "binary files differ" - not very helpful here) +if test -n "$fail" ; then + echo "---- TEST FAILED" + echo "out:" + od -tx1 out + echo "exp:" + od -tx1 exp + echo "err:" + od -tx1 err +fi + + +Exit $fail diff --git a/testsuite/local.mk b/testsuite/local.mk index bf4559f..1181a0c 100644 --- a/testsuite/local.mk +++ b/testsuite/local.mk @@ -44,6 +44,7 @@ LOG_COMPILER = false T = \ testsuite/misc.pl \ testsuite/bug32082.sh \ + testsuite/bug32271-1.sh \ testsuite/cmd-l.sh \ testsuite/cmd-R.sh \ testsuite/colon-with-no-label.sh \