diff options
| author | Stanislav Malyshev <stas@php.net> | 2016-01-31 21:05:46 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2016-01-31 21:06:31 -0800 |
| commit | 00788f9cfbdca9b52b148b7219c9ba05cdc6e130 (patch) | |
| tree | f570f943497d09d96969526fd0c8b5467d8f9d3b /ext/pcre/pcrelib/pcre_exec.c | |
| parent | ef356912b3c4e114d373960178fb8bf138668566 (diff) | |
| parent | ca02d9c2d6f9bea7bf8abe607f1ee9484b1d7b62 (diff) | |
| download | php-git-00788f9cfbdca9b52b148b7219c9ba05cdc6e130.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Upgrade bundled PCRE to 8.38
Fixed NEWS file entry
fix the fix for bug #70976 (imagerotate)
Diffstat (limited to 'ext/pcre/pcrelib/pcre_exec.c')
| -rw-r--r-- | ext/pcre/pcrelib/pcre_exec.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ext/pcre/pcrelib/pcre_exec.c b/ext/pcre/pcrelib/pcre_exec.c index 7efdc443c9..81a19e75e4 100644 --- a/ext/pcre/pcrelib/pcre_exec.c +++ b/ext/pcre/pcrelib/pcre_exec.c @@ -688,7 +688,7 @@ the alternative names that are used. */ #define foc number #define save_mark data -/* These statements are here to stop the compiler complaining about uninitialized +/* These statements are here to stop the compiler complaining about unitialized variables. */ #ifdef SUPPORT_UCP @@ -6685,7 +6685,8 @@ if (md->offset_vector != NULL) register int *iend = iptr - re->top_bracket; if (iend < md->offset_vector + 2) iend = md->offset_vector + 2; while (--iptr >= iend) *iptr = -1; - md->offset_vector[0] = md->offset_vector[1] = -1; + if (offsetcount > 0) md->offset_vector[0] = -1; + if (offsetcount > 1) md->offset_vector[1] = -1; } /* Set up the first character to match, if available. The first_char value is |