diff options
| author | Stanislav Malyshev <stas@php.net> | 2016-02-01 20:45:49 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2016-02-01 20:45:49 -0800 |
| commit | c631f1ee2b4248dcb2658def545ee8fdfe108cb6 (patch) | |
| tree | 8bb4c9d594be1297860530b27f9ef672befe90b4 /ext/standard/string.c | |
| parent | 2764586c6d69225fdc6663b32d4047881a903d7a (diff) | |
| parent | 0fca0d9f4264b0a9bff9909788977e32d719a0cf (diff) | |
| download | php-git-c631f1ee2b4248dcb2658def545ee8fdfe108cb6.tar.gz | |
Merge branch 'PHP-7.0.3' into PHP-7.0
* PHP-7.0.3: (35 commits)
fix tests
update NEWS
fix tests
fix NEWS
Update NEWS
update NEWS
Fixed bug #71475: openssl_seal() uninitialized memory usage
Fixed bug #71488: Stack overflow when decompressing tar archives
fix tests
fix wrong gc sequence
revert the API string as well
update NEWS
Revert "Fix #70720"
sync NEWS
reset ext/session to the state of 7.0.2
update NEWS
update NEWS
add missing headers for SIZE_MAX
backport the escapeshell* functions hardening branch
add tests
...
Conflicts:
configure.in
ext/session/tests/bug69111.phpt
main/php_version.h
Diffstat (limited to 'ext/standard/string.c')
| -rw-r--r-- | ext/standard/string.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/ext/standard/string.c b/ext/standard/string.c index b8ad73660e..03f04a8287 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -4810,9 +4810,6 @@ PHPAPI size_t php_strip_tags_ex(char *rbuf, size_t len, int *stateptr, const cha switch (state) { case 1: /* HTML/XML */ lc = '>'; - if (*(p -1) == '-') { - break; - } in_q = state = 0; if (allow) { if (tp - tbuf >= PHP_TAG_BUF_SIZE) { @@ -4942,7 +4939,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+2 && strncasecmp(p-2, "xm", 2) == 0) { state = 1; break; } |