OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* 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
This commit is contained in:
Ulrich Drepper 2005-07-25 21:41:45 +00:00
parent 09987e425c
commit 02ca3541ce
7 changed files with 126 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,6 +1,16 @@
2005-07-25 Ulrich Drepper <drepper@redhat.com>
* 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.
2005-07-24 Ulrich Drepper <drepper@redhat.com>
* string/test-memset.c (test_main): Use negative byte value is
* string/test-memset.c (test_main): Use negative byte value in
test.
* string/test-memset.c (do_one_test): Compare effect of call, not

3
debug/Makefile
View File

@ -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

3
debug/Versions
View File

@ -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;
}

35
debug/mbstowcs_chk.c Normal file
View File

@ -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 <locale.h>
#include <string.h>
#include <wchar.h>
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);
}

36
debug/wcstombs_chk.c Normal file
View File

@ -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 <locale.h>
#include <string.h>
#include <wchar.h>
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);
}

39
stdlib/bits/stdlib.h
View File

@ -73,3 +73,42 @@ wctomb (char *__s, wchar_t __wchar)
return __wctomb_chk (__s, __wchar, __bos (__s));
return __wctomb_alias (__s, __wchar);
}
extern size_t __mbstowcs_chk (wchar_t *__restrict __dst,
__const char *__restrict __src,
size_t __len, size_t __dstlen) __THROW;
extern size_t __REDIRECT_NTH (__mbstowcs_alias,
(wchar_t *__restrict __dst,
__const char *__restrict __src,
size_t __len), mbstowcs);
extern __always_inline size_t
mbstowcs (wchar_t *__restrict __dst, __const char *__restrict __src,
size_t __len)
{
if (__bos (__dst) != (size_t) -1
&& (!__builtin_constant_p (__len)
|| __len * sizeof (wchar_t) > __bos (__dst)))
return __mbstowcs_chk (__dst, __src, __len, __bos (__dst));
return __mbstowcs_alias (__dst, __src, __len);
}
extern size_t __wcstombs_chk (char *__restrict __dst,
__const wchar_t *__restrict __src,
size_t __len, size_t __dstlen) __THROW;
extern size_t __REDIRECT_NTH (__wcstombs_alias,
(char *__restrict __dst,
__const wchar_t *__restrict __src,
size_t __len), wcstombs);
extern __always_inline size_t
wcstombs (char *__restrict __dst, __const wchar_t *__restrict __src,
size_t __len)
{
if (__bos (__dst) != (size_t) -1
&& (!__builtin_constant_p (__len) || __len > __bos (__dst)))
return __wcstombs_chk (__dst, __src, __len, __bos (__dst));
return __wcstombs_alias (__dst, __src, __len);
}

2
wcsmbs/bits/wchar2.h
View File

@ -320,7 +320,7 @@ extern size_t __REDIRECT_NTH (__mbsrtowcs_alias,
extern __always_inline size_t
mbsrtowcs (wchar_t *__restrict __dst, __const char **__restrict __src,
size_t __len, mbstate_t *__restrict __ps)
size_t __len, mbstate_t *__restrict __ps)
{
if (__bos (__dst) != (size_t) -1
&& (!__builtin_constant_p (__len)