diff options
| author | Nikita Popov <nikic@php.net> | 2016-02-13 17:48:17 +0100 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2016-02-13 17:48:17 +0100 |
| commit | f43fe8cb4c7d70eab536ddae50a38824a5b32af9 (patch) | |
| tree | 6cba06cd9eaa849433bddfafea809e3655c72a57 | |
| parent | 7f474086e34db430dc774795d4ca0c0999b97d93 (diff) | |
| parent | 4e0134c6618844f076d40fb346e78b89e98c825c (diff) | |
| download | php-git-f43fe8cb4c7d70eab536ddae50a38824a5b32af9.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
| -rw-r--r-- | ext/pdo_mysql/tests/bug71569.phpt | 2 | ||||
| -rw-r--r-- | ext/standard/string.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/pdo_mysql/tests/bug71569.phpt b/ext/pdo_mysql/tests/bug71569.phpt index 3ace1e98bf..32c14b4622 100644 --- a/ext/pdo_mysql/tests/bug71569.phpt +++ b/ext/pdo_mysql/tests/bug71569.phpt @@ -1,5 +1,5 @@ --TEST-- -Bug #70389 (PDO constructor changes unrelated variables) +Bug #71569 (#70389 fix causes segmentation fault) --SKIPIF-- <?php require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'skipif.inc'); diff --git a/ext/standard/string.c b/ext/standard/string.c index 2dbe41ed5e..489006b261 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -4943,7 +4943,7 @@ PHPAPI size_t php_strip_tags_ex(char *rbuf, size_t len, int *stateptr, const cha * state == 2 (PHP). Switch back to HTML. */ - if (state == 2 && p > buf+2 && strncasecmp(p-4, "<?xm", 4) == 0) { + if (state == 2 && p > buf+4 && strncasecmp(p-4, "<?xm", 4) == 0) { state = 1; is_xml=1; break; } |