qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Check size of pattern in wide character representation in fnmatch.

This commit is contained in:
Ulrich Drepper 2011-03-18 05:29:20 -04:00
parent ccfe366e6f
commit 8126d90480
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2011-03-18 Ulrich Drepper <drepper@gmail.com>
* posix/fnmatch.c (fnmatch): Check size of pattern in wide
character representation.
Partly based on a patch by Tomas Hoger <thoger@redhat.com>.
2011-03-16 Ryan S. Arnold <rsa@us.ibm.com> 2011-03-16 Ryan S. Arnold <rsa@us.ibm.com>
* sysdeps/powerpc/powerpc32/power6/fpu/s_isnanf.S (isnanf): Fix * sysdeps/powerpc/powerpc32/power6/fpu/s_isnanf.S (isnanf): Fix

13
posix/fnmatch.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1991,1992,1993,1996,1997,1998,1999,2000,2001,2002,2003,2007,2010 /* Copyright (C) 1991,1992,1993,1996,1997,1998,1999,2000,2001,2002,2003,2007,2010,2011
Free Software Foundation, Inc. Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
@ -375,6 +375,11 @@ fnmatch (pattern, string, flags)
XXX Do we have to set `errno' to something which mbsrtows hasn't XXX Do we have to set `errno' to something which mbsrtows hasn't
already done? */ already done? */
return -1; return -1;
if (__builtin_expect (n >= (size_t) -1 / sizeof (wchar_t), 0))
{
__set_errno (ENOMEM);
return -2;
}
wpattern_malloc = wpattern wpattern_malloc = wpattern
= (wchar_t *) malloc ((n + 1) * sizeof (wchar_t)); = (wchar_t *) malloc ((n + 1) * sizeof (wchar_t));
assert (mbsinit (&ps)); assert (mbsinit (&ps));
@ -419,6 +424,12 @@ fnmatch (pattern, string, flags)
XXX Do we have to set `errno' to something which mbsrtows hasn't XXX Do we have to set `errno' to something which mbsrtows hasn't
already done? */ already done? */
goto free_return; goto free_return;
if (__builtin_expect (n >= (size_t) -1 / sizeof (wchar_t), 0))
{
free (wpattern_malloc);
__set_errno (ENOMEM);
return -2;
}
wstring_malloc = wstring wstring_malloc = wstring
= (wchar_t *) malloc ((n + 1) * sizeof (wchar_t)); = (wchar_t *) malloc ((n + 1) * sizeof (wchar_t));