AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-24 03:31:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix allocation when handling positional parameters in printf.

Browse Source
This commit is contained in:
Petr Baudis 2011-02-20 07:59:49 -05:00 committed by Ulrich Drepper
parent e23fe25b33
commit 84a4211850
4 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2011-01-27 Petr Baudis <pasky@suse.cz>
Ulrich Drepper <drepper@gmail.com>
* stdio-common/vfprintf.c (vfprintf): Pass correct newlen
to extend_alloca().
* stdio-common/bug23.c: New file.
* stdio-common/Makefile (tests): Add bug23.
2010-09-28 Andreas Schwab <schwab@redhat.com>
Ulrich Drepper <drepper@gmail.com>

2
stdio-common/Makefile
View File

@ -60,7 +60,7 @@ tests := tstscanf test_rdwr test-popen tstgetln test-fseek \
tst-popen tst-unlockedio tst-fmemopen2 tst-put-error tst-fgets \
tst-fwrite bug16 bug17 tst-swscanf tst-sprintf2 bug18 bug18a \
bug19 bug19a tst-popen2 scanf13 scanf14 scanf15 bug20 bug21 bug22 \
scanf16 scanf17 tst-setvbuf1 tst-grouping
scanf16 scanf17 tst-setvbuf1 tst-grouping bug23
test-srcs = tst-unbputc tst-printf

21
stdio-common/bug23.c Normal file
View File

@ -0,0 +1,21 @@
#include <stdio.h>
#include <string.h>
static char buf[32768];
static const char expected[] = "\
\n\
a\n\
abbcd55%%%%%%%%%%%%%%%%%%%%%%%%%%\n";
static int
do_test (void)
{
snprintf (buf, sizeof (buf),
"\n%1$s\n" "%1$s" "%2$s" "%2$s" "%3$s" "%4$s" "%5$d" "%5$d"
"%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n",
"a", "b", "c", "d", 5);
return strcmp (buf, expected) != 0;
}
#define TEST_FUNCTION do_test ()
#include "../test-skeleton.c"

5
stdio-common/vfprintf.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1991-2008, 2009, 2010 Free Software Foundation, Inc.
/* Copyright (C) 1991-2008, 2009, 2010, 2011 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@ -1682,7 +1682,8 @@ do_positional:
{
/* Extend the array of format specifiers. */
struct printf_spec *old = specs;
specs = extend_alloca (specs, nspecs_max, 2 * nspecs_max);
specs = extend_alloca (specs, nspecs_max,
2 * nspecs_max * sizeof (*specs));
/* Copy the old array's elements to the new space. */
memmove (specs, old, nspecs * sizeof (struct printf_spec));