-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* include/stdio.h (__asprintf_chk, __dprintf_chk,
__obstack_printf_chk): New prototypes. (__vasprintf_chk, __vdprintf_chk, __obstack_vprintf_chk): Likewise. Add libc_hidden_proto. * libio/obprintf.c (_IO_obstack_jumps): No longer static, add attribute_hidden. * libio/bits/stdio-ldbl.h (__asprintf_chk, __dprintf_chk, __obstack_printf_chk, __vasprintf_chk, __vdprintf_chk, __obstack_vprintf_chk): Add __LDBL_REDIR_DECL. * libio/bits/stdio2.h (__asprintf_chk, __dprintf_chk, __obstack_printf_chk, __vasprintf_chk, __vdprintf_chk, __obstack_vprintf_chk): New prototypes. (asprintf, __asprintf, dprintf, obstack_printf, vasprintf, vdprintf, obstack_vprintf): New inlines. * debug/dprintf_chk.c: New file. * debug/vdprintf_chk.c: New file. * debug/asprintf_chk.c: New file. * debug/vasprintf_chk.c: New file. * debug/obprintf_chk.c: New file. * debug/tst-chk1.c (do_test): Add asprintf and obstack_printf tests. * debug/Versions (__asprintf_chk, __dprintf_chk, __obstack_printf_chk, __vasprintf_chk, __vdprintf_chk, __obstack_vprintf_chk): Export @@GLIBC_2.8. * debug/Makefile: Build asprintf_chk, vasprintf_chk, dprintf_chk, vdprintf_chk and obprintf_chk, set CFLAGS for them. * sysdeps/ieee754/ldbl-opt/nldbl-compat.c (__nldbl___vasprintf_chk, __nldbl___vdprintf_chk, __nldbl___obstack_vprintf_chk): Add libc_hidden_proto. * sysdeps/ieee754/ldbl-opt/nldbl-compat.h (__nldbl___vasprintf_chk, __nldbl___vdprintf_chk, __nldbl___obstack_vprintf_chk): New prototypes. * sysdeps/ieee754/ldbl-opt/Versions (__nldbl___asprintf_chk, __nldbl___vasprintf_chk, __nldbl___dprintf_chk, __nldbl___vdprintf_chk, __nldbl___obstack_printf_chk, __nldbl___obstack_vprintf_chk): Export @@GLIBC_2.8. * sysdeps/ieee754/ldbl-opt/Makefile (libnldbl-calls): Add asprintf_chk, vasprintf_chk, dprintf_chk, vdprintf_chk, obstack_printf_chk and obstack_vprintf_chk. * sysdeps/ieee754/ldbl-opt/nldbl-obstack_vprintf_chk.c: New file. * sysdeps/ieee754/ldbl-opt/nldbl-dprintf_chk.c: New file. * sysdeps/ieee754/ldbl-opt/nldbl-obstack_printf_chk.c: New file. * sysdeps/ieee754/ldbl-opt/nldbl-asprintf_chk.c: New file. * sysdeps/ieee754/ldbl-opt/nldbl-vdprintf_chk.c: New file. * sysdeps/ieee754/ldbl-opt/nldbl-vasprintf_chk.c: New file.
- Loading branch information
Ulrich Drepper
committed
Mar 5, 2008
1 parent
a4bb445
commit dff3751
Showing
23 changed files
with
726 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| /* Copyright (C) 1991, 1995, 1997, 1998, 2004, 2006, 2008 | ||
| 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 <libioP.h> | ||
| #include <stdarg.h> | ||
| #include <stdio.h> | ||
|
|
||
|
|
||
| /* Write formatted output from FORMAT to a string which is | ||
| allocated with malloc and stored in *STRING_PTR. */ | ||
| int | ||
| __asprintf_chk (char **result_ptr, int flags, const char *format, ...) | ||
| { | ||
| va_list arg; | ||
| int done; | ||
|
|
||
| va_start (arg, format); | ||
| done = __vasprintf_chk (result_ptr, flags, format, arg); | ||
| va_end (arg); | ||
|
|
||
| return done; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| /* Copyright (C) 1991, 1995, 1997, 1998, 2004, 2006, 2008 | ||
| 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 <libioP.h> | ||
| #include <stdarg.h> | ||
| #include <stdio.h> | ||
|
|
||
|
|
||
| /* Write formatted output to D, according to the format string FORMAT. */ | ||
| int | ||
| __dprintf_chk (int d, int flags, const char *format, ...) | ||
| { | ||
| va_list arg; | ||
| int done; | ||
|
|
||
| va_start (arg, format); | ||
| done = __vdprintf_chk (d, flags, format, arg); | ||
| va_end (arg); | ||
|
|
||
| return done; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,117 @@ | ||
| /* Print output of stream to given obstack. | ||
| Copyright (C) 1996,1997,1999,2000,2001,2002,2003,2004,2005,2006,2008 | ||
| Free Software Foundation, Inc. | ||
| This file is part of the GNU C Library. | ||
| Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. | ||
| 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 <stdlib.h> | ||
| #include <libioP.h> | ||
| #include "../libio/strfile.h" | ||
| #include <assert.h> | ||
| #include <string.h> | ||
| #include <errno.h> | ||
| #include <obstack.h> | ||
| #include <stdarg.h> | ||
| #include <stdio_ext.h> | ||
|
|
||
|
|
||
| struct _IO_obstack_file | ||
| { | ||
| struct _IO_FILE_plus file; | ||
| struct obstack *obstack; | ||
| }; | ||
|
|
||
| extern const struct _IO_jump_t _IO_obstack_jumps attribute_hidden; | ||
|
|
||
| int | ||
| __obstack_vprintf_chk (struct obstack *obstack, int flags, const char *format, | ||
| va_list args) | ||
| { | ||
| struct obstack_FILE | ||
| { | ||
| struct _IO_obstack_file ofile; | ||
| } new_f; | ||
| int result; | ||
| int size; | ||
| int room; | ||
|
|
||
| #ifdef _IO_MTSAFE_IO | ||
| new_f.ofile.file.file._lock = NULL; | ||
| #endif | ||
|
|
||
| _IO_no_init (&new_f.ofile.file.file, _IO_USER_LOCK, -1, NULL, NULL); | ||
| _IO_JUMPS (&new_f.ofile.file) = &_IO_obstack_jumps; | ||
| room = obstack_room (obstack); | ||
| size = obstack_object_size (obstack) + room; | ||
| if (size == 0) | ||
| { | ||
| /* We have to handle the allocation a bit different since the | ||
| `_IO_str_init_static' function would handle a size of zero | ||
| different from what we expect. */ | ||
|
|
||
| /* Get more memory. */ | ||
| obstack_make_room (obstack, 64); | ||
|
|
||
| /* Recompute how much room we have. */ | ||
| room = obstack_room (obstack); | ||
| size = room; | ||
|
|
||
| assert (size != 0); | ||
| } | ||
|
|
||
| _IO_str_init_static_internal ((struct _IO_strfile_ *) &new_f.ofile, | ||
| obstack_base (obstack), | ||
| size, obstack_next_free (obstack)); | ||
| /* Now allocate the rest of the current chunk. */ | ||
| assert (size == (new_f.ofile.file.file._IO_write_end | ||
| - new_f.ofile.file.file._IO_write_base)); | ||
| assert (new_f.ofile.file.file._IO_write_ptr | ||
| == (new_f.ofile.file.file._IO_write_base | ||
| + obstack_object_size (obstack))); | ||
| obstack_blank_fast (obstack, room); | ||
|
|
||
| new_f.ofile.obstack = obstack; | ||
|
|
||
| /* For flags > 0 (i.e. __USE_FORTIFY_LEVEL > 1) request that %n | ||
| can only come from read-only format strings. */ | ||
| if (flags > 0) | ||
| new_f.ofile.file.file._flags2 |= _IO_FLAGS2_FORTIFY; | ||
|
|
||
| result = INTUSE(_IO_vfprintf) (&new_f.ofile.file.file, format, args); | ||
|
|
||
| /* Shrink the buffer to the space we really currently need. */ | ||
| obstack_blank_fast (obstack, (new_f.ofile.file.file._IO_write_ptr | ||
| - new_f.ofile.file.file._IO_write_end)); | ||
|
|
||
| return result; | ||
| } | ||
| libc_hidden_def (__obstack_vprintf_chk) | ||
|
|
||
|
|
||
| int | ||
| __obstack_printf_chk (struct obstack *obstack, int flags, const char *format, | ||
| ...) | ||
| { | ||
| int result; | ||
| va_list ap; | ||
| va_start (ap, format); | ||
| result = __obstack_vprintf_chk (obstack, flags, format, ap); | ||
| va_end (ap); | ||
| return result; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.