lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-30 22:43:12 +03:00
Code Activity

Update.

Browse Source 
* posix/regexec.c (get_subexp): Only set bkref_str after the first
	loop, use buf + bkref_str_off in the loop instead.
	* posix/bug-regex11.c (tests): Add 3 new tests.

	* posix/regexec.c (clean_state_log_if_need): Rename to...
	(clean_state_log_if_needed): ...this.
	(transit_state_mb, get_subexp_sub): Adjust callers.
This commit is contained in:
Ulrich Drepper
2003-12-30 20:01:17 +00:00
parent 5bd4d36871
commit 7c1be3ece5
3 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,5 +1,13 @@
2003-12-30 Jakub Jelinek <jakub@redhat.com> 2003-12-30 Jakub Jelinek <jakub@redhat.com>
* posix/regexec.c (get_subexp): Only set bkref_str after the first
loop, use buf + bkref_str_off in the loop instead.
* posix/bug-regex11.c (tests): Add 3 new tests.
* posix/regexec.c (clean_state_log_if_need): Rename to...
(clean_state_log_if_needed): ...this.
(transit_state_mb, get_subexp_sub): Adjust callers.
* sunrpc/pmap_clnt.c (pmap_set): Do CLNT_DESTROY even if CLNT_CALL * sunrpc/pmap_clnt.c (pmap_set): Do CLNT_DESTROY even if CLNT_CALL
failed. Reported by Steve Grubb. failed. Reported by Steve Grubb.

4
posix/bug-regex11.c
View File

@ -69,6 +69,10 @@ struct
{ "a()d(b)\\1c\\2", "adbcb", REG_EXTENDED, 3, { { 0, 5 }, { 1, 1 }, { 2, 3 } } }, { "a()d(b)\\1c\\2", "adbcb", REG_EXTENDED, 3, { { 0, 5 }, { 1, 1 }, { 2, 3 } } },
{ "a(b())\\2\\1", "abbbb", REG_EXTENDED, 3, { { 0, 3 }, { 1, 2 }, { 2, 2 } } }, { "a(b())\\2\\1", "abbbb", REG_EXTENDED, 3, { { 0, 3 }, { 1, 2 }, { 2, 2 } } },
{ "(bb())\\2\\1", "bbbb", REG_EXTENDED, 3, { { 0, 4 }, { 0, 2 }, { 2, 2 } } }, { "(bb())\\2\\1", "bbbb", REG_EXTENDED, 3, { { 0, 4 }, { 0, 2 }, { 2, 2 } } },
{ "^([^,]*),\\1,\\1$", "a,a,a", REG_EXTENDED, 2, { { 0, 5 }, { 0, 1 } } },
{ "^([^,]*),\\1,\\1$", "ab,ab,ab", REG_EXTENDED, 2, { { 0, 8 }, { 0, 2 } } },
{ "^([^,]*),\\1,\\1,\\1$", "abc,abc,abc,abc", REG_EXTENDED, 2,
{ { 0, 15 }, { 0, 3 } } },
{ "^(.?)(.?)(.?)(.?)(.?).?\\5\\4\\3\\2\\1$", { "^(.?)(.?)(.?)(.?)(.?).?\\5\\4\\3\\2\\1$",
"level", REG_NOSUB | REG_EXTENDED, 0, { { -1, -1 } } }, "level", REG_NOSUB | REG_EXTENDED, 0, { { -1, -1 } } },
{ "^(.?)(.?)(.?)(.?)(.?)(.?)(.?)(.?)(.).?\\9\\8\\7\\6\\5\\4\\3\\2\\1$|^.?$", { "^(.?)(.?)(.?)(.?)(.?)(.?)(.?)(.?)(.).?\\9\\8\\7\\6\\5\\4\\3\\2\\1$|^.?$",

25
posix/regexec.c
View File

@ -117,8 +117,8 @@ static reg_errcode_t sift_states_bkref (const regex_t *preg,
re_match_context_t *mctx, re_match_context_t *mctx,
re_sift_context_t *sctx, re_sift_context_t *sctx,
int str_idx, re_node_set *dest_nodes) internal_function; int str_idx, re_node_set *dest_nodes) internal_function;
static reg_errcode_t clean_state_log_if_need (re_match_context_t *mctx, static reg_errcode_t clean_state_log_if_needed (re_match_context_t *mctx,
int next_state_log_idx) internal_function; int next_state_log_idx) internal_function;
static reg_errcode_t merge_state_array (re_dfa_t *dfa, re_dfastate_t **dst, static reg_errcode_t merge_state_array (re_dfa_t *dfa, re_dfastate_t **dst,
re_dfastate_t **src, int num) internal_function; re_dfastate_t **src, int num) internal_function;
static re_dfastate_t *transit_state (reg_errcode_t *err, const regex_t *preg, static re_dfastate_t *transit_state (reg_errcode_t *err, const regex_t *preg,
@ -1553,7 +1553,7 @@ sift_states_backward (preg, mctx, sctx)
/* Helper functions. */ /* Helper functions. */
static reg_errcode_t static reg_errcode_t
clean_state_log_if_need (mctx, next_state_log_idx) clean_state_log_if_needed (mctx, next_state_log_idx)
re_match_context_t *mctx; re_match_context_t *mctx;
int next_state_log_idx; int next_state_log_idx;
{ {
@ -2392,7 +2392,7 @@ transit_state_mb (preg, pstate, mctx)
dest_idx = re_string_cur_idx (mctx->input) + naccepted; dest_idx = re_string_cur_idx (mctx->input) + naccepted;
mctx->max_mb_elem_len = ((mctx->max_mb_elem_len < naccepted) ? naccepted mctx->max_mb_elem_len = ((mctx->max_mb_elem_len < naccepted) ? naccepted
: mctx->max_mb_elem_len); : mctx->max_mb_elem_len);
err = clean_state_log_if_need (mctx, dest_idx); err = clean_state_log_if_needed (mctx, dest_idx);
if (BE (err != REG_NOERROR, 0)) if (BE (err != REG_NOERROR, 0))
return err; return err;
#ifdef DEBUG #ifdef DEBUG
@ -2569,14 +2569,14 @@ get_subexp (preg, mctx, bkref_node, bkref_str_idx)
reg_errcode_t err; reg_errcode_t err;
re_sub_match_top_t *sub_top = mctx->sub_tops[sub_top_idx]; re_sub_match_top_t *sub_top = mctx->sub_tops[sub_top_idx];
re_sub_match_last_t *sub_last; re_sub_match_last_t *sub_last;
int sub_last_idx, sl_str; int sub_last_idx, sl_str, bkref_str_off;
const char *bkref_str; const char *bkref_str;
if (dfa->nodes[sub_top->node].opr.idx != subexp_num) if (dfa->nodes[sub_top->node].opr.idx != subexp_num)
continue; /* It isn't related. */ continue; /* It isn't related. */
sl_str = sub_top->str_idx; sl_str = sub_top->str_idx;
bkref_str = buf + bkref_str_idx; bkref_str_off = bkref_str_idx;
/* At first, check the last node of sub expressions we already /* At first, check the last node of sub expressions we already
evaluated. */ evaluated. */
for (sub_last_idx = 0; sub_last_idx < sub_top->nlasts; ++sub_last_idx) for (sub_last_idx = 0; sub_last_idx < sub_top->nlasts; ++sub_last_idx)
@ -2587,23 +2587,24 @@ get_subexp (preg, mctx, bkref_node, bkref_str_idx)
/* The matched string by the sub expression match with the substring /* The matched string by the sub expression match with the substring
at the back reference? */ at the back reference? */
if (sl_str_diff > 0 if (sl_str_diff > 0
&& memcmp (bkref_str, buf + sl_str, sl_str_diff) != 0) && memcmp (buf + bkref_str_off, buf + sl_str, sl_str_diff) != 0)
break; /* We don't need to search this sub expression any more. */ break; /* We don't need to search this sub expression any more. */
bkref_str += sl_str_diff; bkref_str_off += sl_str_diff;
sl_str += sl_str_diff; sl_str += sl_str_diff;
err = get_subexp_sub (preg, mctx, sub_top, sub_last, bkref_node, err = get_subexp_sub (preg, mctx, sub_top, sub_last, bkref_node,
bkref_str_idx); bkref_str_idx);
/* Reload buf and bkref_str, since the preceding call might /* Reload buf, since the preceding call might have reallocated
have reallocated the buffer. */ the buffer. */
buf = (const char *) re_string_get_buffer (mctx->input); buf = (const char *) re_string_get_buffer (mctx->input);
bkref_str = buf + bkref_str_idx;
if (err == REG_NOMATCH) if (err == REG_NOMATCH)
continue; continue;
if (BE (err != REG_NOERROR, 0)) if (BE (err != REG_NOERROR, 0))
return err; return err;
} }
bkref_str = buf + bkref_str_off;
if (sub_last_idx < sub_top->nlasts) if (sub_last_idx < sub_top->nlasts)
continue; continue;
if (sub_last_idx > 0) if (sub_last_idx > 0)
@ -2678,7 +2679,7 @@ get_subexp_sub (preg, mctx, sub_top, sub_last, bkref_node, bkref_str)
if (BE (err != REG_NOERROR, 0)) if (BE (err != REG_NOERROR, 0))
return err; return err;
to_idx = bkref_str + sub_last->str_idx - sub_top->str_idx; to_idx = bkref_str + sub_last->str_idx - sub_top->str_idx;
clean_state_log_if_need (mctx, to_idx); clean_state_log_if_needed (mctx, to_idx);
return REG_NOERROR; return REG_NOERROR;
} }