summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Blake <eblake@redhat.com>2010-08-30 12:08:47 -0600
committerEric Blake <eblake@redhat.com>2010-08-30 15:04:21 -0600
commit5f6cb7045448cf3d06bf7e1881406401b2084279 (patch)
tree513bd91f4dc8b0541cc9342d9c7b263889ce3fbc
parent6262484d69f374aad1dea0abfb33d248fafa8dc9 (diff)
downloadm4-5f6cb7045448cf3d06bf7e1881406401b2084279.tar.gz
Test previous commit.
* doc/m4.texinfo (Format): Add a test. * NEWS: Document the fix. * THANKS: Update. Signed-off-by: Eric Blake <eblake@redhat.com> (cherry picked from commit edf2d2a2af08b0d4af530150c1c7b504c803a637)
-rw-r--r--ChangeLog7
-rw-r--r--NEWS3
-rw-r--r--THANKS1
-rw-r--r--doc/m4.texinfo12
4 files changed, 23 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 2842b552..8853fc61 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-08-30 Eric Blake <eblake@redhat.com>
+
+ Test previous commit.
+ * doc/m4.texinfo (Format): Add a test.
+ * NEWS: Document the fix.
+ * THANKS: Update.
+
2010-08-30 Carlo Teubner <carlo.teubner@gmail.com> (tiny change)
Avoid a crash with bad format string.
diff --git a/NEWS b/NEWS
index 7ab57452..1afe7926 100644
--- a/NEWS
+++ b/NEWS
@@ -145,6 +145,9 @@ contains the following beta features that were deemed worth deferring until
* Noteworthy changes in release 1.4.15 (2010-08-??) [stable]
+** Fix regression introduced in 1.4.9b where the format builtin could
+ crash on an invalid format string.
+
** Fix compilation against newer glibc, and on AIX 7.1BETA.
** A number of portability improvements inherited from gnulib.
diff --git a/THANKS b/THANKS
index 91760b91..227654ce 100644
--- a/THANKS
+++ b/THANKS
@@ -24,6 +24,7 @@ Bob Badour bob@badour.net
Bob Proulx bob@proulx.com
Brendan Kehoe brendan@cygnus.com
Bruno Haible bruno@clisp.org
+Carlo Teubner carlo.teubner@gmail.com
Cesar Strauss cestrauss@gmail.com
Chris McGuire chris@wso.net
Chris Penev xpenev@gmail.com
diff --git a/doc/m4.texinfo b/doc/m4.texinfo
index 081d5ce7..91b8e007 100644
--- a/doc/m4.texinfo
+++ b/doc/m4.texinfo
@@ -6902,6 +6902,18 @@ format(`%.1f', `2a')
@result{}2.0
@end example
+@ignore
+@comment Expose a crash with a bad format string fixed in 1.4.15.
+@comment Unfortuntely, 8-bit bytes are hard to check for; but the
+@comment exit status is enough to sniff the crash in broken versions.
+
+@comment xerr: ignore
+@example
+ifelse(format(`%'format(`%c', `128')))
+@result{}
+@end example
+@end ignore
+
@node Arithmetic
@chapter Macros for doing arithmetic