Imported Upstream version 1.4.13+git200906171200
This commit is contained in:
parent
4ab9f0d24c
commit
d0b8ab8112
362 changed files with 34110 additions and 10773 deletions
16
gl/regexec.c
16
gl/regexec.c
|
@ -1,6 +1,6 @@
|
|||
/* Extended regular expression matching and search library.
|
||||
Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation,
|
||||
Inc.
|
||||
Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
|
||||
Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
|
||||
|
||||
|
@ -701,7 +701,8 @@ re_search_internal (const regex_t *preg,
|
|||
fl_longest_match = (nmatch != 0 || dfa->nbackref);
|
||||
|
||||
err = re_string_allocate (&mctx.input, string, length, dfa->nodes_len + 1,
|
||||
preg->translate, preg->syntax & RE_ICASE, dfa);
|
||||
preg->translate, (preg->syntax & RE_ICASE) != 0,
|
||||
dfa);
|
||||
if (BE (err != REG_NOERROR, 0))
|
||||
goto free_return;
|
||||
mctx.input.stop = stop;
|
||||
|
@ -1044,6 +1045,11 @@ prune_impossible_nodes (re_match_context_t *mctx)
|
|||
re_node_set_free (&sctx.limits);
|
||||
if (BE (ret != REG_NOERROR, 0))
|
||||
goto free_return;
|
||||
if (sifted_states[0] == NULL)
|
||||
{
|
||||
ret = REG_NOMATCH;
|
||||
goto free_return;
|
||||
}
|
||||
}
|
||||
re_free (mctx->state_log);
|
||||
mctx->state_log = sifted_states;
|
||||
|
@ -3078,7 +3084,9 @@ check_arrival_add_next_nodes (re_match_context_t *mctx, Idx str_idx,
|
|||
const re_dfa_t *const dfa = mctx->dfa;
|
||||
bool ok;
|
||||
Idx cur_idx;
|
||||
#ifdef RE_ENABLE_I18N
|
||||
reg_errcode_t err = REG_NOERROR;
|
||||
#endif
|
||||
re_node_set union_set;
|
||||
re_node_set_init_empty (&union_set);
|
||||
for (cur_idx = 0; cur_idx < cur_nodes->nelem; ++cur_idx)
|
||||
|
@ -3467,7 +3475,7 @@ out_free:
|
|||
CONTEXT_NEWLINE);
|
||||
if (BE (dest_states_nl[i] == NULL && err != REG_NOERROR, 0))
|
||||
goto out_free;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
dest_states_word[i] = dest_states[i];
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue