mirror of git://sourceware.org/git/glibc.git
[BZ #4514]
* stdio-common/vfprintf.c (vfprintf): Don't shadow workstart variable, reinitialize workend at the start of each do_positional format spec loop, free workstart before do_positional loops. (printf_unknown): Fix size of work_buffer. * stdio-common/tst-sprintf.c (main): Add 3 new testcases.
This commit is contained in:
Ulrich Drepper
parent
1f4843fbff
commit
af269dd954
|
|
@ -1,5 +1,12 @@
|
|||
2007-05-21 Jakub Jelinek <jakub@redhat.com>
|
||||
|
||||
[BZ #4514]
|
||||
* stdio-common/vfprintf.c (vfprintf): Don't shadow workstart variable,
|
||||
reinitialize workend at the start of each do_positional format spec
|
||||
loop, free workstart before do_positional loops.
|
||||
(printf_unknown): Fix size of work_buffer.
|
||||
* stdio-common/tst-sprintf.c (main): Add 3 new testcases.
|
||||
|
||||
* malloc/hooks.c (MALLOC_STATE_VERSION): Bump.
|
||||
(public_sET_STATe): If ms->version < 3, put all chunks into
|
||||
unsorted chunks and clear {fd,bk}_nextsize fields of largebin
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
|
||||
/* Copyright (C) 2002, 2003, 2005, 2007 Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
|
||||
|
||||
|
|
@ -104,7 +104,7 @@ __unregister_atfork (dso_handle)
|
|||
atomic_decrement (&deleted->handler->refcntr);
|
||||
unsigned int val;
|
||||
while ((val = deleted->handler->refcntr) != 0)
|
||||
lll_futex_wait (&deleted->handler->refcntr, val);
|
||||
lll_futex_wait (&deleted->handler->refcntr, val, LLL_FUTEX_PRIVATE);
|
||||
|
||||
deleted = deleted->next;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -37,5 +37,26 @@ main (void)
|
|||
free (dst);
|
||||
}
|
||||
|
||||
if (sprintf (buf, "%1$d%3$.*2$s%4$d", 7, 67108863, "x", 8) != 3
|
||||
|| strcmp (buf, "7x8") != 0)
|
||||
{
|
||||
printf ("sprintf (buf, \"%%1$d%%3$.*2$s%%4$d\", 7, 67108863, \"x\", 8) produced `%s' output", buf);
|
||||
result = 1;
|
||||
}
|
||||
|
||||
if (sprintf (buf, "%67108863.16\"%d", 7) != 14
|
||||
|| strcmp (buf, "%67108863.16\"7") != 0)
|
||||
{
|
||||
printf ("sprintf (buf, \"%%67108863.16\\\"%%d\", 7) produced `%s' output", buf);
|
||||
result = 1;
|
||||
}
|
||||
|
||||
if (sprintf (buf, "%*\"%d", 0x3ffffff, 7) != 11
|
||||
|| strcmp (buf, "%67108863\"7") != 0)
|
||||
{
|
||||
printf ("sprintf (buf, \"%%*\\\"%%d\", 0x3ffffff, 7) produced `%s' output", buf);
|
||||
result = 1;
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1627,6 +1627,8 @@ do_positional:
|
|||
/* Just a counter. */
|
||||
size_t cnt;
|
||||
|
||||
free (workstart);
|
||||
workstart = NULL;
|
||||
|
||||
if (grouping == (const char *) -1)
|
||||
{
|
||||
|
|
@ -1801,7 +1803,9 @@ do_positional:
|
|||
int use_outdigits = specs[nspecs_done].info.i18n;
|
||||
char pad = specs[nspecs_done].info.pad;
|
||||
CHAR_T spec = specs[nspecs_done].info.spec;
|
||||
CHAR_T *workstart = NULL;
|
||||
|
||||
workstart = NULL;
|
||||
workend = &work_buffer[sizeof (work_buffer) / sizeof (CHAR_T)];
|
||||
|
||||
/* Fill in last information. */
|
||||
if (specs[nspecs_done].width_arg != -1)
|
||||
|
|
@ -1897,8 +1901,7 @@ do_positional:
|
|||
break;
|
||||
}
|
||||
|
||||
if (__builtin_expect (workstart != NULL, 0))
|
||||
free (workstart);
|
||||
free (workstart);
|
||||
workstart = NULL;
|
||||
|
||||
/* Write the following constant string. */
|
||||
|
|
@ -1926,7 +1929,7 @@ printf_unknown (FILE *s, const struct printf_info *info,
|
|||
|
||||
{
|
||||
int done = 0;
|
||||
CHAR_T work_buffer[MAX (info->width, info->spec) + 32];
|
||||
CHAR_T work_buffer[MAX (sizeof (info->width), sizeof (info->prec)) * 3];
|
||||
CHAR_T *const workend
|
||||
= &work_buffer[sizeof (work_buffer) / sizeof (CHAR_T)];
|
||||
register CHAR_T *w;
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ endif
|
|||
|
||||
ifeq ($(subdir),misc)
|
||||
sysdep_routines += sysctl clone llseek umount umount2 readahead \
|
||||
setfsuid setfsgid makedev
|
||||
setfsuid setfsgid makedev epoll_pwait
|
||||
|
||||
CFLAGS-gethostid.c = -fexceptions
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,69 @@
|
|||
/* Copyright (C) 2007 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
|
||||
modify it under the terms of the GNU Lesser General Public
|
||||
License as published by the Free Software Foundation; either
|
||||
version 2.1 of the License, or (at your option) any later version.
|
||||
|
||||
The GNU C Library is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
Lesser General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public
|
||||
License along with the GNU C Library; if not, write to the Free
|
||||
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
||||
02111-1307 USA. */
|
||||
|
||||
#include <errno.h>
|
||||
#include <signal.h>
|
||||
#include <unistd.h>
|
||||
#include <sys/epoll.h>
|
||||
|
||||
#include <sysdep-cancel.h>
|
||||
#include <sys/syscall.h>
|
||||
|
||||
#ifdef __NR_epoll_pwait
|
||||
|
||||
/* Wait for events on an epoll instance "epfd". Returns the number of
|
||||
triggered events returned in "events" buffer. Or -1 in case of
|
||||
error with the "errno" variable set to the specific error code. The
|
||||
"events" parameter is a buffer that will contain triggered
|
||||
events. The "maxevents" is the maximum number of events to be
|
||||
returned ( usually size of "events" ). The "timeout" parameter
|
||||
specifies the maximum wait time in milliseconds (-1 == infinite).
|
||||
The thread's signal mask is temporarily and atomically replaced with
|
||||
the one provided as parameter. */
|
||||
|
||||
int epoll_pwait (int epfd, struct epoll_event *events,
|
||||
int maxevents, int timeout,
|
||||
const sigset_t *set)
|
||||
{
|
||||
if (SINGLE_THREAD_P)
|
||||
return INLINE_SYSCALL (epoll_pwait, 6, epfd, events, maxevents, timeout,
|
||||
set, _NSIG / 8);
|
||||
|
||||
int oldtype = LIBC_CANCEL_ASYNC ();
|
||||
|
||||
int result = INLINE_SYSCALL (epoll_pwait, 6, epfd, events, maxevents,
|
||||
timeout, set, _NSIG / 8);
|
||||
|
||||
LIBC_CANCEL_RESET (oldtype);
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
#else
|
||||
|
||||
int epoll_pwait (int epfd, struct epoll_event *events,
|
||||
int maxevents, int timeout,
|
||||
const sigset_t *set)
|
||||
{
|
||||
__set_errno (ENOSYS);
|
||||
return -1;
|
||||
}
|
||||
stub_warning (epoll_pwait)
|
||||
|
||||
# include <stub-tag.h>
|
||||
#endif
|
||||
|
|
@ -10,7 +10,6 @@ delete_module EXTRA delete_module 3 delete_module
|
|||
epoll_create EXTRA epoll_create i:i epoll_create
|
||||
epoll_ctl EXTRA epoll_ctl i:iiip epoll_ctl
|
||||
epoll_wait EXTRA epoll_wait Ci:ipii epoll_wait
|
||||
epoll_pwait EXTRA epoll_pwait Ci:ipiipi epoll_pwait
|
||||
fdatasync - fdatasync Ci:i fdatasync
|
||||
flock - flock i:ii __flock flock
|
||||
fork - fork i: __libc_fork __fork fork
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* Copyright (C) 2002,2003,2004,2005,2006 Free Software Foundation, Inc.
|
||||
/* Copyright (C) 2002,2003,2004,2005,2006,2007 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
|
||||
|
|
@ -22,6 +22,14 @@
|
|||
#include <stdint.h>
|
||||
#include <sys/types.h>
|
||||
|
||||
/* Get __sigset_t. */
|
||||
#include <bits/sigset.h>
|
||||
|
||||
#ifndef __sigset_t_defined
|
||||
# define __sigset_t_defined
|
||||
typedef __sigset_t sigset_t;
|
||||
#endif
|
||||
|
||||
|
||||
enum EPOLL_EVENTS
|
||||
{
|
||||
|
|
@ -105,6 +113,16 @@ extern int epoll_ctl (int __epfd, int __op, int __fd,
|
|||
extern int epoll_wait (int __epfd, struct epoll_event *__events,
|
||||
int __maxevents, int __timeout);
|
||||
|
||||
|
||||
/* Same as epoll_wait, but the thread's signal mask is temporarily
|
||||
and atomically replaced with the one provided as parameter.
|
||||
|
||||
This function is a cancellation point and therefore not marked with
|
||||
__THROW. */
|
||||
extern int epoll_pwait (int __epfd, struct epoll_event *__events,
|
||||
int __maxevents, int __timeout,
|
||||
__const __sigset_t *__ss);
|
||||
|
||||
__END_DECLS
|
||||
|
||||
#endif /* sys/epoll.h */
|
||||
|
|
|
|||
Loading…
Reference in New Issue