From 02ca3541ce1b81a6778ca811cc251a30280d0120 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Mon, 25 Jul 2005 21:41:45 +0000 Subject: * debug/mbstowcs_chk.c: New file. * debug/wcstombs_chk.c: New file. * debug/Makefile (routines): Add mbstowcs_chk and wcstombs_chk. * debug/Versions: Add __mbstowcs_chk and __wcstombs_chk. * stdlib/bits/stdlib.h: Add definitions for mbstowcs and wcstombs. * wcsmbs/bits/wchar2.h (mbsrtowcs): Pretty printing. * string/test-memset.c (test_main): Use negative byte value in --- debug/Makefile | 3 ++- debug/Versions | 3 ++- debug/mbstowcs_chk.c | 35 +++++++++++++++++++++++++++++++++++ debug/wcstombs_chk.c | 36 ++++++++++++++++++++++++++++++++++++ 4 files changed, 75 insertions(+), 2 deletions(-) create mode 100644 debug/mbstowcs_chk.c create mode 100644 debug/wcstombs_chk.c (limited to 'debug') diff --git a/debug/Makefile b/debug/Makefile index 009c05c..9123bf6 100644 --- a/debug/Makefile +++ b/debug/Makefile @@ -39,7 +39,8 @@ routines = backtrace backtracesyms backtracesymsfd noophooks \ vwprintf_chk vfwprintf_chk fgetws_chk fgetws_u_chk \ confstr_chk getgroups_chk ttyname_r_chk getlogin_r_chk \ gethostname_chk getdomainname_chk wcrtomb_chk mbsnrtowcs_chk \ - wcsnrtombs_chk mbsrtowcs_chk wcsrtombs_chk \ + wcsnrtombs_chk mbsrtowcs_chk wcsrtombs_chk mbstowcs_chk \ + wcstombs_chk \ stack_chk_fail \ $(static-only-routines) static-only-routines := warning-nop stack_chk_fail_local diff --git a/debug/Versions b/debug/Versions index 2f4183b..683eb17 100644 --- a/debug/Versions +++ b/debug/Versions @@ -31,7 +31,8 @@ libc { __vwprintf_chk; __vfwprintf_chk; __fgetws_chk; __fgetws_unlocked_chk; __confstr_chk; __getgroups_chk; __ttyname_r_chk; __getlogin_r_chk; __gethostname_chk; __getdomainname_chk; __wcrtomb_chk; __mbsnrtowcs_chk; - __wcsnrtombs_chk; __mbsrtowcs_chk; __wcsrtombs_chk; + __wcsnrtombs_chk; __mbsrtowcs_chk; __wcsrtombs_chk; __mbstowcs_chk; + __wcstombs_chk; __stack_chk_fail; } diff --git a/debug/mbstowcs_chk.c b/debug/mbstowcs_chk.c new file mode 100644 index 0000000..2c1c3bb --- /dev/null +++ b/debug/mbstowcs_chk.c @@ -0,0 +1,35 @@ +/* Copyright (C) 2005 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 +#include +#include + + +size_t +__mbstowcs_chk (wchar_t *dst, const char **src, size_t len, size_t dstlen) +{ + if (__builtin_expect (dstlen < len * sizeof (wchar_t), 0)) + __chk_fail (); + + mbstate_t state; + + memset (&state, '\0', sizeof state); + /* Return how many we wrote (or maybe an error). */ + return __mbsrtowcs (dst, src, len, &state); +} diff --git a/debug/wcstombs_chk.c b/debug/wcstombs_chk.c new file mode 100644 index 0000000..f5f51a0 --- /dev/null +++ b/debug/wcstombs_chk.c @@ -0,0 +1,36 @@ +/* Copyright (C) 2005 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 +#include +#include + + +size_t +__wcstombs_chk (char *dst, __const wchar_t *src, size_t len, size_t dstlen) +{ + if (__builtin_expect (dstlen < len, 0)) + __chk_fail (); + + mbstate_t state; + + memset (&state, '\0', sizeof state); + + /* Return how many we wrote (or maybe an error). */ + return __wcsrtombs (dst, src, len, &state); +} -- cgit v1.1