about summary refs log tree commit diff
path: root/posix/regexec.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-11-19 07:18:32 +0000
committerUlrich Drepper <drepper@redhat.com>2003-11-19 07:18:32 +0000
commit3ee363e23115e63f8dcc34bf5b7bd5e1a084635c (patch)
treec825366f4549a27f0d4c44301821fa5b0b208990 /posix/regexec.c
parentc9002c1b7a648fe49b8472d6dc6724c78fa1329f (diff)
downloadglibc-3ee363e23115e63f8dcc34bf5b7bd5e1a084635c.tar.gz
glibc-3ee363e23115e63f8dcc34bf5b7bd5e1a084635c.tar.xz
glibc-3ee363e23115e63f8dcc34bf5b7bd5e1a084635c.zip
Update.
2003-11-18  Ulrich Drepper  <drepper@redhat.com>

	* posix/regexec.c (get_subexp): Adter calling get_subexp_seb
	reload buf and bkref_str.  Little optimization by avoiding memcmp.

2003-11-14  David Mosberger   <davidm@hpl.hp.com>
Diffstat (limited to 'posix/regexec.c')
-rw-r--r--posix/regexec.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/posix/regexec.c b/posix/regexec.c
index 6f4448a078..03b97e883c 100644
--- a/posix/regexec.c
+++ b/posix/regexec.c
@@ -2550,6 +2550,12 @@ get_subexp (preg, mctx, bkref_node, bkref_str_idx)
 	  sl_str += sl_str_diff;
 	  err = get_subexp_sub (preg, mctx, sub_top, sub_last, bkref_node,
 				bkref_str_idx);
+
+	  /* Reload buf and bkref_str, since the preceding call might
+	     have reallocated the buffer.  */
+	  buf = (char *) re_string_get_buffer (mctx->input);
+	  bkref_str = buf + bkref_str_idx;
+
 	  if (err == REG_NOMATCH)
 	    continue;
 	  if (BE (err != REG_NOERROR, 0))
@@ -2567,8 +2573,7 @@ get_subexp (preg, mctx, bkref_node, bkref_str_idx)
 	  sl_str_off = sl_str - sub_top->str_idx;
 	  /* The matched string by the sub expression match with the substring
 	     at the back reference?  */
-	  if (sl_str_off > 0
-	      && memcmp (bkref_str++, buf + sl_str - 1, 1) != 0)
+	  if (sl_str_off > 0 && *bkref_str++ != buf[sl_str - 1])
 	    break; /* We don't need to search this sub expression any more.  */
 	  if (mctx->state_log[sl_str] == NULL)
 	    continue;