Update.

2003-11-22  Ulrich Drepper  <drepper@redhat.com>

	* posix/PTESTS: Fix first test of GA143.

	* posix/regex_internal.c (re_dfa_add_node): Add BE, reallocation
	isn't likely.

diff --git a/ChangeLog b/ChangeLog
index 7a2bc976b0ff96882d5bf18f9a61fa796f38fcac..e5e2a56a9ca8700c53e9d18a630fa2333c0f906b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
+2003-11-22  Ulrich Drepper  <drepper@redhat.com>
+
+       * posix/PTESTS: Fix first test of GA143.
+
 2003-11-21  Ulrich Drepper  <drepper@redhat.com>
 
+       * posix/regex_internal.c (re_dfa_add_node): Add BE, reallocation
+       isn't likely.
+
        * locale/programs/charmap.c (charmap_read): If encoding is found
        not ASCII compatible, set enc_not_ascii_compatible.
        * locale/programs/charmap.h: Declare enc_not_ascii_compatible.

diff --git a/posix/PTESTS b/posix/PTESTS
index 7d2676e20f11057f6207d48731e90211f485a8c5..8732a2ccfe3bc7c2f815d6191560e68107e5dbfb 100644 (file)
--- a/posix/PTESTS
+++ b/posix/PTESTS
@@ -270,7 +270,8 @@
 1¦63¦a\{1,63\}¦aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa¦
 # 2.8.3.4  BRE Precedence
 # GA143
-2¦20¦\^\[[[.].]]\\(\\1\\)\*\\{1,2\\}\$¦a^[]\(1\)*\{1,2\}$b¦
+#W There are numerous bugs in the original version.
+2¦19¦\^\[[[.].]]\\(\\1\\)\*\\{1,2\\}\$¦a^[]\(\1\)*\{1,2\}$b¦
 1¦6¦[[=*=]][[=\=]][[=]=]][[===]][[...]][[:punct:]]¦*\]=.;¦
 1¦6¦[$\(*\)^]*¦$\()*^¦
 1¦1¦[\1]¦1¦

diff --git a/posix/ptestcases.h b/posix/ptestcases.h
index 1a15f75f8226c1c75e9613daf6ab03a50b431c64..8f008acf5a47f90d3cf82166d8d23f5d49c8f990 100644 (file)
--- a/posix/ptestcases.h
+++ b/posix/ptestcases.h
@@ -265,7 +265,7 @@
   { 1, 63, "a\\{1,63\\}", "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",  },
   { 0, 0, "2.8.3.4  BRE Precedence", NULL, },
   { 0, 0, "GA143", NULL, },
-  { 2, 20, "\\^\\[[[.].]]\\\\(\\\\1\\\\)\\*\\\\{1,2\\\\}\\$", "a^[]\\(1\\)*\\{1,2\\}$b",  },
+  { 2, 19, "\\^\\[[[.].]]\\\\(\\\\1\\\\)\\*\\\\{1,2\\\\}\\$", "a^[]\\(\\1\\)*\\{1,2\\}$b",  },
   { 1, 6, "[[=*=]][[=\\=]][[=]=]][[===]][[...]][[:punct:]]", "*\\]=.;",  },
   { 1, 6, "[$\\(*\\)^]*", "$\\()*^",  },
   { 1, 1, "[\\1]", "1",  },

diff --git a/posix/regex_internal.c b/posix/regex_internal.c
index 71496ab90692c4d336c31bb271d4af3d99d6b4d5..50d6a79300fa65240b7ffb6f03c1050629226019 100644 (file)
--- a/posix/regex_internal.c
+++ b/posix/regex_internal.c
@@ -1040,7 +1040,7 @@ re_dfa_add_node (dfa, token, mode)
      re_token_t token;
      int mode;
 {
-  if (dfa->nodes_len >= dfa->nodes_alloc)
+  if (BE (dfa->nodes_len >= dfa->nodes_alloc, 0))
     {
       re_token_t *new_array;
       dfa->nodes_alloc *= 2;