* [PATCH] Fix regex bug with empty alternatives
@ 2002-08-08 13:00 Jakub Jelinek
2002-08-12 12:21 ` Ulrich Drepper
0 siblings, 1 reply; 2+ messages in thread
From: Jakub Jelinek @ 2002-08-08 13:00 UTC (permalink / raw)
To: Ulrich Drepper, Roland McGrath, isamu; +Cc: Glibc hackers, msw
Hi!
(xx|yy||zz) style regex was parsed incorrectly as if it was
(xx|yy|yy|zz) and the node representing xx was shared, leading to double free.
(|xx|yy|zz) or (xx||yy|zz) worked right though, in the second case because
branch was still NULL in parse_reg_exp.
BTW: Why is free_bin_tree implemented using recursion when it could just
walk over the tree (each node has left, right and parent)?
2002-08-08 Jakub Jelinek <jakub@redhat.com>
* posix/regcomp.c (parse_reg_exp): If '|' is immediately followed
by another '|', end of regex or enclosing ')', clear branch.
* posix/bug-regex9.c: New test.
* posix/Makefile (tests): Add bug-regex9.
--- libc/posix/regcomp.c.jj 2002-07-29 15:14:54.000000000 +0200
+++ libc/posix/regcomp.c 2002-08-08 21:44:40.000000000 +0200
@@ -1807,6 +1807,8 @@ parse_reg_exp (regexp, preg, token, synt
return NULL;
}
}
+ else
+ branch = NULL;
tree = create_tree (tree, branch, 0, new_idx);
if (BE (new_idx == -1 || tree == NULL, 0))
return *err = REG_ESPACE, NULL;
--- libc/posix/bug-regex9.c.jj 2002-08-08 21:52:47.000000000 +0200
+++ libc/posix/bug-regex9.c 2002-08-08 22:04:14.000000000 +0200
@@ -0,0 +1,67 @@
+/* Test for memory handling in regex.
+ Copyright (C) 2002 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Ulrich Drepper <drepper@redhat.com>, 2001.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+#include <sys/types.h>
+#include <mcheck.h>
+#include <regex.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+
+static const char text[] = "#! /bin/sh";
+
+int
+main (void)
+{
+ regex_t re;
+ regmatch_t rm[2];
+ int n;
+
+ mtrace ();
+
+ n = regcomp (&re, "^#! */.*/(k|ba||pdk|z)sh", REG_EXTENDED);
+ if (n != 0)
+ {
+ char buf[500];
+ regerror (n, &re, buf, sizeof (buf));
+ printf ("regcomp failed: %s\n", buf);
+ exit (1);
+ }
+
+ for (n = 0; n < 20; ++n)
+ {
+ if (regexec (&re, text, 2, rm, 0))
+ {
+ puts ("regexec failed");
+ exit (2);
+ }
+ if (rm[0].rm_so != 0 || rm[0].rm_eo != 10
+ || rm[1].rm_so != 8 || rm[1].rm_eo != 8)
+ {
+ printf ("regexec match failure: %d %d %d %d\n",
+ rm[0].rm_so, rm[0].rm_eo, rm[1].rm_so, rm[1].rm_eo);
+ exit (3);
+ }
+ }
+
+ regfree (&re);
+
+ return 0;
+}
--- libc/posix/Makefile.jj 2002-08-08 10:39:19.000000000 +0200
+++ libc/posix/Makefile 2002-08-08 22:11:50.000000000 +0200
@@ -72,7 +72,7 @@ tests := tstgetopt testfnm runtests run
tst-truncate64 tst-fork tst-fnmatch tst-regexloc tst-dir \
tst-chmod bug-regex1 bug-regex2 bug-regex3 bug-regex4 \
tst-gnuglob tst-regex bug-regex5 bug-regex6 bug-regex7 \
- bug-regex8
+ bug-regex8 bug-regex9
ifeq (yes,$(build-shared))
test-srcs := globtest
tests += wordexp-test tst-exec tst-spawn
Jakub
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] Fix regex bug with empty alternatives
2002-08-08 13:00 [PATCH] Fix regex bug with empty alternatives Jakub Jelinek
@ 2002-08-12 12:21 ` Ulrich Drepper
0 siblings, 0 replies; 2+ messages in thread
From: Ulrich Drepper @ 2002-08-12 12:21 UTC (permalink / raw)
To: Jakub Jelinek; +Cc: Roland McGrath, isamu, Glibc hackers, msw
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Jakub Jelinek wrote:
> 2002-08-08 Jakub Jelinek <jakub@redhat.com>
>
> * posix/regcomp.c (parse_reg_exp): If '|' is immediately followed
> by another '|', end of regex or enclosing ')', clear branch.
> * posix/bug-regex9.c: New test.
> * posix/Makefile (tests): Add bug-regex9.
I've applied this patch now. Thanks,
- --
- ---------------. ,-. 1325 Chesapeake Terrace
Ulrich Drepper \ ,-------------------' \ Sunnyvale, CA 94089 USA
Red Hat `--' drepper at redhat.com `------------------------
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQE9WAq52ijCOnn/RHQRAiBKAJ9Xrq99HTT5hXSS2J6KtEpptLzlHgCgq5mD
LxbmhpAmOaJTDweZbaWfQFk=
=x7aJ
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2002-08-12 19:21 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2002-08-08 13:00 [PATCH] Fix regex bug with empty alternatives Jakub Jelinek
2002-08-12 12:21 ` Ulrich Drepper
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).