summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>2009-03-21 17:26:03 +0000
committerph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>2009-03-21 17:26:03 +0000
commitf84b85155f5362c46f32722abc6ce8d9f41fafe7 (patch)
tree771237fe1ae62be4675c40b7303513064544fda3
parent575800a40bd7ecda6dd0cd6bb30b8705079ab56a (diff)
downloadpcre-f84b85155f5362c46f32722abc6ce8d9f41fafe7.tar.gz
Add missing #ifdef SUPPORT_UTF8 round heapframe::Xcharptr.
git-svn-id: svn://vcs.exim.org/pcre/code/trunk@402 2f5784b3-3f2a-0410-8824-cb99058d5e15
-rw-r--r--ChangeLog4
-rw-r--r--pcre_exec.c2
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 24b7084..7514aaf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -86,6 +86,10 @@ Version 7.9 xx-xxx-09
vector, but for larger vectors malloc() is used. It was failing to free
when the recursion yielded PCRE_ERROR_MATCH_LIMIT (or any other "abnormal"
error, in fact).
+
+22. There was a missing #ifdef SUPPORT_UTF8 round one of the variables in the
+ heapframe that is used only when UTF-8 support is enabled. This caused no
+ problem, but was untidy.
Version 7.8 05-Sep-08
diff --git a/pcre_exec.c b/pcre_exec.c
index aaed7e8..55cc4aa 100644
--- a/pcre_exec.c
+++ b/pcre_exec.c
@@ -334,7 +334,9 @@ typedef struct heapframe {
/* Function local variables */
const uschar *Xcallpat;
+#ifdef SUPPORT_UTF8
const uschar *Xcharptr;
+#endif
const uschar *Xdata;
const uschar *Xnext;
const uschar *Xpp;