Set a sane default recursion limit of 8192 instead of 1000000. Patch by

        * glib/pcre/Makefile.am: Set a sane default recursion limit
        of 8192 instead of 1000000.
        Patch by Mart Raudsepp.

svn path=/trunk/; revision=7166

diff --git a/ChangeLog b/ChangeLog
index f851bd4dc5ac639f7a3f75031bc1199ceb10fcd7..b17145d1d923c465be1bde78acc78113b98236d7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-07-05  Matthias Clasen  <mclasen@redhat.com>
+
+       Bug 528317 – GRegex does not allow recursion limit
+
+       * glib/pcre/Makefile.am: Set a sane default recursion limit
+       of 8192 instead of 1000000. 
+       Patch by Mart Raudsepp.
+
 2008-07-04  Behdad Esfahbod  <behdad@gnome.org>
 
        Bug 541507 – Ambiguous description of assigned characters in the Glib

diff --git a/glib/pcre/Makefile.am b/glib/pcre/Makefile.am
index 78a76b143ca5b60b0411e0e2340c37dd761fcfc8..fa6fe6a208520015b92f0cb3940ad118e8ccf94b 100644 (file)
--- a/glib/pcre/Makefile.am
+++ b/glib/pcre/Makefile.am
@@ -6,7 +6,7 @@ INCLUDES = \
        -DSUPPORT_UTF8 \
        -DNEWLINE=-1 \
        -DMATCH_LIMIT=10000000 \
-       -DMATCH_LIMIT_RECURSION=10000000 \
+       -DMATCH_LIMIT_RECURSION=8192 \
        -DMAX_NAME_SIZE=32 \
        -DMAX_NAME_COUNT=10000 \
        -DMAX_DUPLENGTH=30000 \