From e42e2fe1689dcd0de8358a10e59138094f26ee01 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 6 Jul 2008 04:25:18 +0000 Subject: [PATCH] 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 --- ChangeLog | 8 ++++++++ glib/pcre/Makefile.am | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index f851bd4d..b17145d1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-07-05 Matthias Clasen + + 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 Bug 541507 – Ambiguous description of assigned characters in the Glib diff --git a/glib/pcre/Makefile.am b/glib/pcre/Makefile.am index 78a76b14..fa6fe6a2 100644 --- 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 \ -- 2.34.1