picnoir/glibc
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix infloop on persistent failing calloc in regex.

Browse source
This commit is contained in:
Jim Meyering 2010-12-27 18:19:56 -05:00 committed by Ulrich Drepper
parent db014c1269
commit 2543fef229
3 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2010-12-27 Jim Meyering <meyering@redhat.com>
[BZ #12348]
* posix/regexec.c (build_trtable): Return failure indication upon
calloc failure. Otherwise, re_search_internal could infloop on OOM.
2010-12-25 Ulrich Drepper <drepper@gmail.com>
[BZ #12201]

4
NEWS
View file

@ -1,4 +1,4 @@
GNU C Library NEWS -- history of user-visible changes. 2010-12-26
GNU C Library NEWS -- history of user-visible changes. 2010-12-27
Copyright (C) 1992-2009, 2010 Free Software Foundation, Inc.
See the end for copying conditions.
@ -12,7 +12,7 @@ Version 2.13
3268, 7066, 10085, 10851, 11149, 11611, 11640, 11655, 11701, 11840, 11856,
11883, 11903, 11904, 11968, 11979, 12005, 12037, 12067, 12077, 12078, 12092,
12093, 12107, 12108, 12113, 12140, 12159, 12167, 12191, 12194, 12201, 12204,
12205, 12207
12205, 12207, 12348
* New Linux interfaces: prlimit, prlimit64, fanotify_init, fanotify_mark

2
posix/regexec.c
View file

@ -3373,6 +3373,8 @@ build_trtable (const re_dfa_t *dfa, re_dfastate_t *state)
{
state->trtable = (re_dfastate_t **)
calloc (sizeof (re_dfastate_t *), SBC_MAX);
if (BE (state->trtable == NULL, 0))
return 0;
return 1;
}
return 0;