Attachment 311810 Details for Bug 452079 – Upstream patch

[patch] Upstream patch

pcre-CVE-2008-2371.diff (text/plain), 2.03 KB, created by Tomas Hoger on 2008-07-15 12:22:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tomas Hoger

Created: 2008-07-15 12:22:52 UTC

Size: 2.03 KB

patch

obsolete

>--- code/trunk/pcre_compile.c	2008/07/09 16:20:19	359
>+++ code/trunk/pcre_compile.c	2008/07/09 20:00:28	360
>@@ -4920,10 +4920,8 @@
>         both phases.
> 
>         If we are not at the pattern start, compile code to change the ims
>-        options if this setting actually changes any of them. We also pass the
>-        new setting back so that it can be put at the start of any following
>-        branches, and when this group ends (if we are in a group), a resetting
>-        item can be compiled. */
>+        options if this setting actually changes any of them, and reset the 
>+        greedy defaults and the case value for firstbyte and reqbyte. */
> 
>         if (*ptr == ')')
>           {
>@@ -4931,7 +4929,6 @@
>                (lengthptr == NULL || *lengthptr == 2 + 2*LINK_SIZE))
>             {
>             cd->external_options = newoptions;
>-            options = newoptions;
>             }
>          else
>             {
>@@ -4940,17 +4937,17 @@
>               *code++ = OP_OPT;
>               *code++ = newoptions & PCRE_IMS;
>               }
>-
>-            /* Change options at this level, and pass them back for use
>-            in subsequent branches. Reset the greedy defaults and the case
>-            value for firstbyte and reqbyte. */
>-
>-            *optionsptr = options = newoptions;
>             greedy_default = ((newoptions & PCRE_UNGREEDY) != 0);
>             greedy_non_default = greedy_default ^ 1;
>-            req_caseopt = ((options & PCRE_CASELESS) != 0)? REQ_CASELESS : 0;
>+            req_caseopt = ((newoptions & PCRE_CASELESS) != 0)? REQ_CASELESS : 0;
>             }
> 
>+          /* Change options at this level, and pass them back for use
>+          in subsequent branches. When not at the start of the pattern, this
>+          information is also necessary so that a resetting item can be 
>+          compiled at the end of a group (if we are in a group). */
>+
>+          *optionsptr = options = newoptions;
>           previous = NULL;       /* This item can't be repeated */
>           continue;              /* It is complete */
>           }

Actions: View | Diff

Attachments on bug 452079: 311810