delta/m4.git, branch branch-1.4

output: Avoid tickling UBSAN with memcpy(dest, NULL, 0)

2023-01-13T22:33:49+00:00

Even though all libc handle it sanely (because size 0 says there is
nothing to copy), NULL is not a valid source pointer per a strict
reading of C, so UBSAN flags it:

+output.c:511:9: runtime error: null pointer passed as argument 2, which is declared to never be null

* src/output.c (make_room_for): Skip no-op memcpy.
Fixes: https://savannah.gnu.org/support/index.php?110809
Reported-by: Sam James

format: force C locale on floating point

2023-01-13T21:41:14+00:00

A minor release is not the time for format(`%.1f', `4.0') to complain
about 4.0 not being a number followed by outputting "4,0" in locales
where the decimal point is a comma.  Such a change belongs better in a
major release where more thought is put into locale-awareness across
the board.

* src/m4.c (main): Force LC_NUMERIC to c.
Reported-by: Bruno Haible in
https://lists.gnu.org/r/bug-m4/2021-06/msg00021.html

maint: update to latest gnulib

2023-01-13T21:11:44+00:00

* gnulib: Update to latest.
* m4/gnulib-cache.m4: Copyright date is bumped as a result.

symtab: Fix memory corruption when tracing a popdef'd macro

2023-01-13T21:02:26+00:00

While debugging a script with 'm4 -daeqt', I was surprised to see
uninitialized memory in the trace for one of the macro invocations.
Rerunning it under valgrind confirmed a use-after-free.

* src/symtab.c (free_symbol): When popdef marks an in-expansion nested
definition unused, clone its name in case it is being traced.
(lookup_symbol) [SYMBOL_INSERT]: Consistently use SYMBOL_NAME(), and
share the name across a symbol stack instead of needing to clone.
* doc/m4.texi (Undefine): Test this.
* NEWS: Document the fix.

Fixes: ee427b83b5 ("symtab: use less memory in pushdef stacks")

build: Don't add _FORTIFY_SOURCE if already set by user/toolchain

2023-01-13T19:48:49+00:00

Newer toolchains (GCC 12+ or Clang 9+, glibc-2.34) allow _FORTIFY_SOURCE=3.

The current macro used in configure.ac will forcefully downgrade to F_S=2
and emit a warning if the user set something else:
```
x86_64-pc-linux-gnu-gcc -DEXEEXT=\"\" -I. -I../lib  -DIN_M4_GNULIB_TESTS=1 -I. -I. -I.. -I./.. -I../lib -I./../lib   -O2 -pipe -march=native -fdiagnostics-color=always -frecord-gcc-switches -Wreturn-type      -ggdb3 -Werror=implicit-function-declaration -Werror=implicit-int -c -o glthread/thread.o glthread/thread.c
In file included from glthread/thread.c:20:
../lib/config.h:202: warning: "_FORTIFY_SOURCE" redefined
  202 |    # define _FORTIFY_SOURCE 2
      |
: note: this is the location of the previous definition
```

See: 390d259efe8e1c7e4b6babb4738fef7427416857
Signed-off-by: Sam James 
Message-Id: <20230109080431.1320075-1-sam@gentoo.org>

maint: update bootstrap

2023-01-13T19:47:32+00:00

Done via:
  for f in gl/build-aux/*; do cp ~/bootstrap/build-aux/$(basename $f) $f; done
  gl/build-aux/inline-source gl/build-aux/bootstrap.in > bootstrap

* gl/build-aux/*: Sync from upstream.
* bootstrap: Regenerate.

maint: bump copyright year

2023-01-13T18:45:17+00:00

Run 'make update-copyright' for 2023.

maint: fix possible NULL dereference

2022-01-26T18:28:48+00:00

Problem found by --enable-gcc-warnings.
* src/m4.h: Include intprops.h.
* src/output.c (m4_tmpname): Do not assume that xasprintf
returns non-null pointer.

maint: omit duplicate include

2022-01-26T18:28:48+00:00

* src/format.c: Do not include xvasprintf.h,
as m4.h does that.

maint: pacify --enable-gcc-warnings

2022-01-26T18:28:48+00:00

* src/symtab.c (lookup_symbol): Reword slightly,
to work around bug in GCC 11.2.0 when --enable-gcc-warnings.