From 0e2491480a2ccb4736aa919c1d7bd197fcaee885 Mon Sep 17 00:00:00 2001 From: Weixie Cui Date: Sun, 8 Mar 2026 12:43:22 -0700 Subject: [PATCH] sed: avoid a one-time, one-byte leak * sed/execute.c (line_reset): Also free buf->text when buf->alloc is zero. * testsuite/bug80573.sh: New file. * testsuite/local.mk (T): Add it to the list. Demonstrate via this: echo | valgrind --leak-check=full sed/sed -e x -e 's/.*/echo hi/e' 2>&1 | grep -A5 'definitely lost' Reported in https://bugs.gnu.org/80573 --- sed/execute.c | 5 ++++- testsuite/bug80573.sh | 28 ++++++++++++++++++++++++++++ testsuite/local.mk | 3 ++- 3 files changed, 34 insertions(+), 2 deletions(-) create mode 100755 testsuite/bug80573.sh diff --git a/sed/execute.c b/sed/execute.c index f31187e..eee3ff9 100644 --- a/sed/execute.c +++ b/sed/execute.c @@ -296,7 +296,10 @@ static void line_reset (struct line *buf, struct line *state) { if (buf->alloc == 0) - line_init (buf, state, INITIAL_BUFFER_SIZE); + { + free (buf->text); + line_init (buf, state, INITIAL_BUFFER_SIZE); + } else { buf->length = 0; diff --git a/testsuite/bug80573.sh b/testsuite/bug80573.sh new file mode 100755 index 0000000..05840f2 --- /dev/null +++ b/testsuite/bug80573.sh @@ -0,0 +1,28 @@ +#!/bin/sh +# sed-4.9 and prior would leak a single byte in this one contrived case. + +# Copyright (C) 2026 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 + +require_valgrind_ + +echo > in || framework_failure_ +valgrind --quiet --error-exitcode=1 --leak-check=full \ + --errors-for-leak-kinds=definite \ + sed -e x -e 's/.*/echo hi/e' in || fail=1 + +exit $fail diff --git a/testsuite/local.mk b/testsuite/local.mk index a545f65..fda7c4b 100644 --- a/testsuite/local.mk +++ b/testsuite/local.mk @@ -43,7 +43,8 @@ LOG_COMPILER = false T = \ testsuite/misc.pl \ - testsuite/bug32082.sh \ + testsuite/bug80573.sh \ + testsuite/bug32082.sh \ testsuite/bug32271-1.sh \ testsuite/bug32271-2.sh \ testsuite/cmd-l.sh \