| author | "Benoît Thébaudeau" <benoit.thebaudeau@advansee.com> |
| Mon Dec 12 20:24:05 2011 +0100 (2011-12-12) | |
| branch | 1.13 |
| changeset 2846 | f634ec0447cd |
| parent 1201 | c9967a6e3b25 |
| permissions | -rw-r--r-- |
| yann@1201 | 1 |
Original patch from: gentoo/src/patchsets/glibc/2.9/0053_all_glibc-2.9-regex-BZ697.patch |
| yann@1201 | 2 |
|
| yann@1201 | 3 |
-= BEGIN original header =- |
| yann@1201 | 4 |
http://sourceware.org/ml/libc-alpha/2009-01/msg00006.html |
| yann@1201 | 5 |
|
| yann@1201 | 6 |
From 37bdc055ceeb6b1144c07448a7210d9ab3fbb2f5 Mon Sep 17 00:00:00 2001 |
| yann@1201 | 7 |
From: Ulrich Drepper <drepper@redhat.com> |
| yann@1201 | 8 |
Date: Thu, 8 Jan 2009 00:47:05 +0000 |
| yann@1201 | 9 |
Subject: [PATCH] (prune_impossible_nodes): Handle sifted_states[0] being NULL also if |
| yann@1201 | 10 |
there are no backreferences. |
| yann@1201 | 11 |
|
| yann@1201 | 12 |
-= END original header =- |
| yann@1201 | 13 |
|
| yann@1201 | 14 |
diff -durN glibc-2_9.orig/posix/regexec.c glibc-2_9/posix/regexec.c |
| yann@1201 | 15 |
--- glibc-2_9.orig/posix/regexec.c 2007-10-12 19:47:13.000000000 +0200 |
| yann@1201 | 16 |
+++ glibc-2_9/posix/regexec.c 2009-02-02 22:00:43.000000000 +0100 |
| yann@1201 | 17 |
@@ -1004,6 +1004,11 @@ |
| yann@1201 | 18 |
re_node_set_free (&sctx.limits); |
| yann@1201 | 19 |
if (BE (ret != REG_NOERROR, 0)) |
| yann@1201 | 20 |
goto free_return; |
| yann@1201 | 21 |
+ if (sifted_states[0] == NULL) |
| yann@1201 | 22 |
+ {
|
| yann@1201 | 23 |
+ ret = REG_NOMATCH; |
| yann@1201 | 24 |
+ goto free_return; |
| yann@1201 | 25 |
+ } |
| yann@1201 | 26 |
} |
| yann@1201 | 27 |
re_free (mctx->state_log); |
| yann@1201 | 28 |
mctx->state_log = sifted_states; |