vfscanf: Use struct scratch_buffer instead of extend_alloca

A custom character buffer is added in this commit, in the form of
struct char_buffer.  The char_buffer_add function replaces the
ADDW macro (which has grown with each successive security fix).
The char_buffer_add slow path is moved out-of-line, reducing
code size.

	* stdio-common/vfscanf.c (MEMCPY): Remove macro.
	(struct char_buffer): New type.
	(char_buffer_start, char_buffer_size, char_buffer_error)
	(char_buffer_rewind, char_buffer_add): New functions.
	(ADDW): Remove macro, replaced by the char_buffer_add function.
	(_IO_vfscanf_internal): Rewrite using struct char_buffer instead
	of extend_alloca.  Make control flow more explicit.

1 files changed, 10 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 63701d1bd2..b759929bf9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2015-10-15  Florian Weimer  <fweimer@redhat.com>
+
+	* stdio-common/vfscanf.c (MEMCPY): Remove macro.
+	(struct char_buffer): New type.
+	(char_buffer_start, char_buffer_size, char_buffer_error)
+	(char_buffer_rewind, char_buffer_add): New functions.
+	(ADDW): Remove macro, replaced by the char_buffer_add function.
+	(_IO_vfscanf_internal): Rewrite using struct char_buffer instead
+	of extend_alloca.  Make control flow more explicit.
+
 2015-10-15  H.J. Lu  <hongjiu.lu@intel.com>
 
 	[BZ #19137]