Sync with savannah gawk cvsps 133. In builtin.c (format_tree): Free o…

…buf before call to fatal to keep valgrind happy.
gvlx · Aug 12, 2007 · 2b58d09 · 2b58d09
1 parent 81a06ac
commit 2b58d09
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Aug  3 15:01:38 2007  Andrew J. Schorr <[email protected]>
+
+	* builtin.c (format_tree): Free `obuf' before call to `fatal'
+	to keep valgrind happy.
+
 Mon Jun  4 01:12:21 2007  Arnold D. Robbins  <[email protected]>
 
 	* All relevant files: Updated copyright year to 2007.

diff --git a/XMLChangeLog b/XMLChangeLog
@@ -1,3 +1,10 @@
+Sun Aug 12 14:59:01 UTC 2007 Juergen Kahrs <[email protected]>
+
+	Sync with savannah gawk cvsps 133.
+
+	* ChangeLog, builtin.c (format_tree): Free `obuf' before call to `fatal'
+	to keep valgrind happy.
+
 Sun Jul  1 19:28:54 UTC 2007 Andrew J. Schorr <[email protected]>
 
 	* bisonfix.sed: Remove from CVS (no longer used).

diff --git a/builtin.c b/builtin.c
@@ -1245,11 +1245,13 @@ format_tree(
 		default:
 			break;
 		}
-		if (toofew)
+		if (toofew) {
+			free(obuf);	/* silence valgrind */
 			fatal("%s\n\t`%s'\n\t%*s%s",
 			      _("not enough arguments to satisfy format string"),
 			      fmt_string, (int) (s1 - fmt_string - 1), "",
 			      _("^ ran out for this one"));
+		}
 	}
 	if (do_lint) {
 		if (need_format)