Attachment 630005 Details for Bug 866520 – Upstream fix ported to pcre-6.6

[patch] Upstream fix ported to pcre-6.6

pcre-6.6-Fix-backtrack-past-start-of-subject-in-non-UTF-8-mod.patch (text/plain), 2.34 KB, created by Petr Pisar on 2012-10-19 12:28:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Petr Pisar

Created: 2012-10-19 12:28:42 UTC

Size: 2.34 KB

patch

obsolete

>From 2e044941499c9671b3e75ec19a08bbf92383aac4 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
>Date: Fri, 19 Oct 2012 13:57:57 +0200
>Subject: [PATCH] Fix backtrack past start of subject in non-UTF-8 mode
>
>This is back-port of upstream commit r207 for pcre-6.6:
>
>From c686e88e16cd4dfec241981367ab8c35c9a148f6 Mon Sep 17 00:00:00 2001
>From: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>
>Date: Mon, 6 Aug 2007 09:32:14 +0000
>Subject: [PATCH] Fix backtrack past start of subject bugs caused by the use
> of \X, \p, or \P in non-UTF-8 mode and the presence of
> top-bit-set characters.
>
>git-svn-id: svn://vcs.exim.org/pcre/code/trunk@207
>2f5784b3-3f2a-0410-8824-cb99058d5e15
>
>See <https://bugzilla.redhat.com/show_bug.cgi?id=866520>.
>---
> pcre_exec.c          |  4 ++--
> testdata/testinput6  |  9 +++++++++
> testdata/testoutput6 | 12 ++++++++++++
> 3 files changed, 23 insertions(+), 2 deletions(-)
>
>diff --git a/pcre_exec.c b/pcre_exec.c
>index ecb3297..fbee2cc 100644
>--- a/pcre_exec.c
>+++ b/pcre_exec.c
>@@ -3013,7 +3013,7 @@ for (;;)
>           RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);
>           if (rrc != MATCH_NOMATCH) RRETURN(rrc);
>           if (eptr-- == pp) break;        /* Stop if tried at original pos */
>-          BACKCHAR(eptr);
>+          if (utf8) BACKCHAR(eptr);
>           }
>         }
> 
>@@ -3051,9 +3051,9 @@ for (;;)
>           for (;;)                        /* Move back over one extended */
>             {
>             int len = 1;
>-            BACKCHAR(eptr);
>             if (!utf8) c = *eptr; else
>               {
>+              BACKCHAR(eptr);
>               GETCHARLEN(c, eptr, len);
>               }
>             prop_category = _pcre_ucp_findprop(c, &prop_chartype, &prop_script);
>diff --git a/testdata/testinput6 b/testdata/testinput6
>index a45920a..39ee20c 100644
>--- a/testdata/testinput6
>+++ b/testdata/testinput6
>@@ -738,4 +738,13 @@
>      \x{1c5}XY
>      AXY      
> 
>+/\X{1,3}\d/
>+  \x8aBCD
>+  
>+/\X?\d/
>+  \x8aBCD 
>+
>+/\P{L}?\d/
>+  \x8aBCD 
>+
> / End of testinput6 /
>diff --git a/testdata/testoutput6 b/testdata/testoutput6
>index 87833bd..1c3a72e 100644
>--- a/testdata/testoutput6
>+++ b/testdata/testoutput6
>@@ -1394,4 +1394,16 @@ No match
>      AXY      
> No match
> 
>+/\X{1,3}\d/
>+  \x8aBCD
>+No match
>+  
>+/\X?\d/
>+  \x8aBCD 
>+No match
>+
>+/\P{L}?\d/
>+  \x8aBCD 
>+No match
>+
> / End of testinput6 /
>-- 
>1.7.11.7
>

Actions: View | Diff

Attachments on bug 866520: 627475 | 628829 | 629315 | 630005