summaryrefslogtreecommitdiff
path: root/ext/pcre/pcrelib/pcre_compile.c
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2013-06-10 14:31:57 -0700
committerStanislav Malyshev <stas@php.net>2013-06-10 14:31:57 -0700
commit8ac131503ddeee5b1de8225510f9d2927e903620 (patch)
treef02250a3e6cb8712adc02d23eb2e1b0f5dd3b3fd /ext/pcre/pcrelib/pcre_compile.c
parentd7c943e2a1f54c445276fc77369918f33c4f6cce (diff)
parent4427d1dcfdca5e5e4b7e1b1226cf4771cc82389f (diff)
downloadphp-git-8ac131503ddeee5b1de8225510f9d2927e903620.tar.gz
Merge branch 'PHP-5.5'
* PHP-5.5: Merge branch 'pull-request/341' Merge branch 'pull-request/341'
Diffstat (limited to 'ext/pcre/pcrelib/pcre_compile.c')
-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 5f0c8ed087..4997b3b1ec 100644
--- a/ext/pcre/pcrelib/pcre_compile.c
+++ b/ext/pcre/pcrelib/pcre_compile.c
@@ -8139,7 +8139,7 @@ if (code - codestart > length) errorcode = ERR23;
#ifdef SUPPORT_VALGRIND
/* If the estimated length exceeds the really used length, mark the extra
-allocated memory as unadressable, so that any out-of-bound reads can be
+allocated memory as unaddressable, so that any out-of-bound reads can be
detected. */
VALGRIND_MAKE_MEM_NOACCESS(code, (length - (code - codestart)) * sizeof(pcre_uchar));
#endif