This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "GNU M4 source repository".
http://git.sv.gnu.org/gitweb/?p=m4.git;a=commitdiff;h=3ec47b1812dfba17c1f34992d74d1ed7c6e7950f The branch, master has been updated via 3ec47b1812dfba17c1f34992d74d1ed7c6e7950f (commit) via 85a18b6adec624c57168a04f74eca94f5a53d721 (commit) from b5b24ec23ec1f242e8d4f3571ec288d9d03fd58d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 3ec47b1812dfba17c1f34992d74d1ed7c6e7950f Author: Eric Blake <[EMAIL PROTECTED]> Date: Wed Feb 20 17:11:02 2008 -0700 Fix out-of-bounds read for sanitized macro names, from 2008-02-06. * m4/utility.c (m4_verror_at_line): Properly terminate the string. Reported by Ralf Wildenhues. Signed-off-by: Eric Blake <[EMAIL PROTECTED]> commit 85a18b6adec624c57168a04f74eca94f5a53d721 Author: Eric Blake <[EMAIL PROTECTED]> Date: Wed Feb 20 07:57:41 2008 -0700 * doc/m4.texinfo (Debuglen, Changesyntax): Fix typos. Signed-off-by: Eric Blake <[EMAIL PROTECTED]> ----------------------------------------------------------------------- Summary of changes: ChangeLog | 8 ++++++++ Makefile.am | 3 ++- doc/m4.texinfo | 6 +++--- m4/utility.c | 1 + 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1832be1..d0f4e27 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-02-20 Eric Blake <[EMAIL PROTECTED]> + + Fix out-of-bounds read for sanitized macro names, from 2008-02-06. + * m4/utility.c (m4_verror_at_line): Properly terminate the string. + Reported by Ralf Wildenhues. + + * doc/m4.texinfo (Debuglen, Changesyntax): Fix typos. + 2008-02-19 Eric Blake <[EMAIL PROTECTED]> Clean up example on filtering defined symbols. diff --git a/Makefile.am b/Makefile.am index 2ef7261..de70bc7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -64,7 +64,8 @@ MAINTAINERCLEANFILES = \ MKSTAMP = $(SHELL) $(srcdir)/$(config_aux_dir)/mkstamp # Make sure config.status is regenerated when the version timestamp changes -CONFIG_STATUS_DEPENDENCIES = ChangeLog +#ebb +#CONFIG_STATUS_DEPENDENCIES = ChangeLog ## ------- ## diff --git a/doc/m4.texinfo b/doc/m4.texinfo index 011fbfb..5ed20ea 100644 --- a/doc/m4.texinfo +++ b/doc/m4.texinfo @@ -15,7 +15,7 @@ @c @tabchar{} @c ---------- @c The testsuite expects literal tab output in some examples, but [EMAIL PROTECTED] literal tabs in texinfo lead to formatting issues. [EMAIL PROTECTED] literal tabs in texinfo leads to formatting issues. @macro tabchar @ @c @end macro @@ -3866,7 +3866,7 @@ $ @kbd{m4 -d -l 4 -t echo} debuglen(`oops') @error{}m4:stdin:1: Warning: debuglen: non-numeric argument `oops' @result{} -define(`echo', `$@') +define(`echo', `$@@') @result{} echo(`long string') @error{}m4trace: -1- echo(`long...') -> ``lon...' @@ -4950,7 +4950,7 @@ doesn't match between expansion and rescanning. @c FIXME - changing syntax of , should not break iterative macros. @example $ @kbd{m4 -d} -changesyntax(`,=|')traceon(`foo')define(`foo'|`$#:$@') +changesyntax(`,=|')traceon(`foo')define(`foo'|`$#:$@@') @result{} foo(foo(1|2|3)) @error{}m4trace: -2- foo(`1', `2', `3') -> `3:`1',`2',`3'' diff --git a/m4/utility.c b/m4/utility.c index 60b7644..89b4083 100644 --- a/m4/utility.c +++ b/m4/utility.c @@ -170,6 +170,7 @@ m4_verror_at_line (m4 *context, bool warn, int status, int errnum, *p++ = *macro++; } while (*macro); + *p = '\0'; } /* Prepend warning and the macro name, as needed. But if that fails for non-memory reasons (unlikely), then still use the original hooks/post-receive -- GNU M4 source repository
