summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNuno Lopes <nlopess@php.net>2008-07-06 15:23:31 +0000
committerNuno Lopes <nlopess@php.net>2008-07-06 15:23:31 +0000
commitd771fa6da1560a085989bc7deb1d6d11004c5e0a (patch)
treeb4f186cc306a97a0dc922a48d37b86c9e14b3e43
parent053dc572cae9811b28aca7e4494051bba2bcae51 (diff)
downloadphp-git-d771fa6da1560a085989bc7deb1d6d11004c5e0a.tar.gz
fix CVE-2008-2371. patch by Tavis Ormandy
# currently there's no release of PCRE with this fix. PCRE's author recommended applying this patch in the meantime
-rw-r--r--ext/pcre/pcrelib/pcre_compile.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/pcre/pcrelib/pcre_compile.c b/ext/pcre/pcrelib/pcre_compile.c
index 51a51e1253..0f3ebf93fd 100644
--- a/ext/pcre/pcrelib/pcre_compile.c
+++ b/ext/pcre/pcrelib/pcre_compile.c
@@ -4929,7 +4929,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
{