From dd2bdc858ff5e92d1bddd7ca54fddcb03aabfb5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
Date: Thu, 9 Apr 2015 17:02:59 +0200
Subject: [PATCH] Fix memory bug for [\S\V\H] compile.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is upstream commit ported to 8.33:

commit ef430ada283aba3ff71d7de496904f4d137280f8
Author: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>
Date:   Fri Mar 27 16:44:50 2015 +0000

    Fix memory bug for [\S\V\H] compile.

    git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1536 2f5784b3-3f2a-0410-8824-
cb99058d5e15

Signed-off-by: Petr Písař <ppisar@redhat.com>
---
 pcre_compile.c       | 6 ++++++
 testdata/testinput4  | 2 ++
 testdata/testoutput4 | 2 ++
 3 files changed, 10 insertions(+)

diff --git a/pcre_compile.c b/pcre_compile.c
index 5786a6b..2432437 100644
--- a/pcre_compile.c
+++ b/pcre_compile.c
@@ -4686,6 +4686,12 @@ for (;; ptr++)
       }
 #endif
 
+    /* Even though any XCLASS list is now discarded, we must allow for
+    its memory. */
+
+    if (lengthptr != NULL)
+      *lengthptr += (int)(class_uchardata - class_uchardata_base);
+
     /* If there are no characters > 255, or they are all to be included or
     excluded, set the opcode to OP_CLASS or OP_NCLASS, depending on whether the
     whole class was negated and whether there were negative specials such as \S
diff --git a/testdata/testinput4 b/testdata/testinput4
index b9f1a72..8e9b477 100644
--- a/testdata/testinput4
+++ b/testdata/testinput4
@@ -711,4 +711,6 @@
     \x{100}\x{100}\x{100}\x{100}
     \x{100}\x{100}\x{100}
 
+"[\S\V\H]"8
+
 /-- End of testinput4 --/
diff --git a/testdata/testoutput4 b/testdata/testoutput4
index 6694111..34cf636 100644
--- a/testdata/testoutput4
+++ b/testdata/testoutput4
@@ -1257,4 +1257,6 @@ No match
     \x{100}\x{100}\x{100}
 No match
 
+"[\S\V\H]"8
+
 /-- End of testinput4 --/
-- 
2.1.0