From 7bdd7beaa2a19a1f49170c48fd8b1efa33d466eb Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 1 Jul 2008 03:29:08 +0000 Subject: [PATCH] Apply fix for CVE-2008-2371 to fix a heap-based buffer overflow. * glib/pcre/pcre_compile.c: Apply fix for CVE-2008-2371 to fix a heap-based buffer overflow. svn path=/branches/glib-2-16/; revision=7124 --- ChangeLog | 7 +++++++ glib/pcre/pcre_compile.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 259c1c7f3..9114614ff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-06-30 Matthias Clasen + + Backport from trunk: + + * glib/pcre/pcre_compile.c: Apply fix for CVE-2008-2371 to + fix a heap-based buffer overflow. + 2008-06-30 Matthias Clasen * glib/pcre/*: Update to PCRE 7.7 diff --git a/glib/pcre/pcre_compile.c b/glib/pcre/pcre_compile.c index 514127f21..54756bc74 100644 --- a/glib/pcre/pcre_compile.c +++ b/glib/pcre/pcre_compile.c @@ -4807,7 +4807,7 @@ we set the flag only if there is a literal "\r" or "\n" in the class. */ (lengthptr == NULL || *lengthptr == 2 + 2*LINK_SIZE)) { cd->external_options = newoptions; - options = newoptions; + options = *optionsptr = newoptions; } else {