AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-23 03:10:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update.

Browse Source 
* posix/regcomp.c (mark_opt_subexp_iter): Declare IDX as int.

	* posix/regexec.c (re_copy_regs): Fix testing for failed allocation.
	_IO_peekc_unlocked, _IO_putc_unlocked, _IO_getwc_unlocked, and
This commit is contained in:
Ulrich Drepper 2003-12-29 00:42:16 +00:00
parent 5a299c962e
commit a96c63edd2
3 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,11 +1,12 @@
2003-12-28 Ulrich Drepper <drepper@redhat.com>
* posix/regexec.c (re_copy_regs): Allocate start and end array in
one block.
* posix/regcomp.c (mark_opt_subexp_iter): Declare IDX as int.
* posix/regexec.c (re_copy_regs): Fix testing for failed allocation.
(push_fail_stack): Add missing check for failed memory allocation.
* libio/libio.h: Use __builtin_expect in _IO_getc_unlocked,
_IO_peekc_unlocked, _IO_ptc_unlocked, _IO_getwc_unlocked, and
_IO_peekc_unlocked, _IO_putc_unlocked, _IO_getwc_unlocked, and
_IO_putwc_unlocked.
2003-12-28 Andreas Jaeger <aj@suse.de>

5
posix/regcomp.c
View File

@ -614,7 +614,7 @@ free_dfa_content (re_dfa_t *dfa)
re_free (dfa->word_char);
#ifdef RE_ENABLE_I18N
re_free (dfa->sb_char);
#endif
#endif
#ifdef DEBUG
re_free (dfa->re_str);
#endif
@ -2479,7 +2479,7 @@ parse_dup_op (elem, regexp, dfa, token, syntax, err)
mark_opt_subexp (elem, dfa);
tree = elem = re_dfa_add_tree_node (dfa, elem, NULL, &dup_token);
}
if (BE (elem == NULL || tree == NULL, 0))
goto parse_dup_op_espace;
@ -3731,6 +3731,7 @@ static void
mark_opt_subexp_iter (src, dfa, idx)
const bin_tree_t *src;
re_dfa_t *dfa;
int idx;
{
int node_idx;

17
posix/regexec.c
View File

@ -455,10 +455,10 @@ re_copy_regs (regs, pmatch, nregs, regs_allocated)
if (regs_allocated == REGS_UNALLOCATED)
{ /* No. So allocate them with malloc. We allocate the arrays
for the start and end in one block. */
regs->start = re_malloc (regoff_t, 2 * need_regs);
if (BE (regs->start == NULL, 0))
regs->start = re_malloc (regoff_t, need_regs);
regs->end = re_malloc (regoff_t, need_regs);
if (BE (regs->start == NULL, 0) || BE (regs->end == NULL, 0))
return REGS_UNALLOCATED;
regs->end = regs->start + need_regs;
regs->num_regs = need_regs;
}
else if (regs_allocated == REGS_REALLOCATE)
@ -467,13 +467,10 @@ re_copy_regs (regs, pmatch, nregs, regs_allocated)
leave it alone. */
if (BE (need_regs > regs->num_regs, 0))
{
regs->start = re_realloc (regs->start, regoff_t, 2 * need_regs);
if (BE (regs->start == NULL, 0))
{
regs->end = NULL;
return REGS_UNALLOCATED;
}
regs->end = regs->start + need_regs;
regs->start = re_realloc (regs->start, regoff_t, need_regs);
regs->end = re_realloc (regs->end, regoff_t, need_regs);
if (BE (regs->start == NULL, 0) || BE (regs->end == NULL, 0))
return REGS_UNALLOCATED;
regs->num_regs = need_regs;
}
}