From c22a74728313ee35f6bf143238d42e2eca9ed020 Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Wed, 15 Feb 2023 08:46:02 +0100 Subject: [PATCH] gas: buffer_and_nest() needs to pass nul-terminated string to temp_ilp() In 7545aa2dd2eb ("gas: improve interaction between read_a_source_file() and s_linefile()") I didn't pay attention to the dual purpose of the nul character previously used. This was to a fair degree because of the open-coding of certain operations. Insert the earlier found line terminator instead of a hard-coded newline, and do so early in this special case (bypassing the later general insertion point). Plus properly use sb_terminate() to mark the end of the string. (Note that saved_eol_char was misnamed: Without calling sb_terminate() there's simply random data at that position in the buffer.) --- gas/macro.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gas/macro.c b/gas/macro.c index f9f2d63e9f7..afcd48b3a88 100644 --- a/gas/macro.c +++ b/gas/macro.c @@ -263,13 +263,13 @@ buffer_and_nest (const char *from, const char *to, sb *ptr, if (from != NULL && strcasecmp (from, "MACRO") == 0 && len >= 8 && strncasecmp (ptr->ptr + i, "linefile", 8) == 0) { - char saved_eol_char = ptr->ptr[ptr->len]; - - ptr->ptr[ptr->len] = '\n'; - temp_ilp (ptr->ptr + i + 8); + sb_add_char (ptr, more); + temp_ilp (sb_terminate (ptr) + i + 8); s_linefile (0); restore_ilp (); - ptr->ptr[ptr->len] = saved_eol_char; + line_start = ptr->len; + more = get_line (ptr); + continue; } } -- 2.30.2