diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-10-07 17:50:24 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-10-07 17:50:24 +0200 |
| commit | c774619118ba8cdfe6ddb33769d99ac425277769 (patch) | |
| tree | d56130487dc8eae416236715bdbde36559879d96 /ext | |
| parent | 91f47ee2633c77f073ee9ea68bb9a28842498304 (diff) | |
| parent | ff3878adeb5e73e514a0f7a1cb367a3b350301c9 (diff) | |
| download | php-git-c774619118ba8cdfe6ddb33769d99ac425277769.tar.gz | |
Merge branch 'PHP-7.4' into master
* PHP-7.4:
Fix #77040: tidyNode::isHtml() is completely broken
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/tidy/tests/bug77040.phpt | 27 | ||||
| -rw-r--r-- | ext/tidy/tidy.c | 11 |
2 files changed, 34 insertions, 4 deletions
diff --git a/ext/tidy/tests/bug77040.phpt b/ext/tidy/tests/bug77040.phpt new file mode 100644 index 0000000000..a1af00bdfb --- /dev/null +++ b/ext/tidy/tests/bug77040.phpt @@ -0,0 +1,27 @@ +--TEST-- +Bug #77040 (tidyNode::isHtml() is completely broken) +--SKIPIF-- +<?php +if (!extension_loaded('tidy')) die('skip tidy extension not available'); +?> +--FILE-- +<?php +$tidy = new tidy; +$tidy->parseString("<p>text</p><p><![CDATA[cdata]]></p>"); +$p = $tidy->body()->child[0]; +var_dump($p->type === TIDY_NODETYPE_START); +var_dump($p->isHtml()); +$text = $p->child[0]; +var_dump($text->type === TIDY_NODETYPE_TEXT); +var_dump($text->isHtml()); +$cdata = $tidy->body()->child[1]->child[0]; +var_dump($cdata->type === TIDY_NODETYPE_CDATA); +var_dump($cdata->isHtml()); +?> +--EXPECT-- +bool(true) +bool(true) +bool(true) +bool(false) +bool(true) +bool(false)
\ No newline at end of file diff --git a/ext/tidy/tidy.c b/ext/tidy/tidy.c index 58d398b006..0efa594b69 100644 --- a/ext/tidy/tidy.c +++ b/ext/tidy/tidy.c @@ -1525,11 +1525,14 @@ PHP_METHOD(tidyNode, isHtml) { TIDY_FETCH_ONLY_OBJECT; - if (tidyNodeGetType(obj->node) & (TidyNode_Start | TidyNode_End | TidyNode_StartEnd)) { - RETURN_TRUE; + switch (tidyNodeGetType(obj->node)) { + case TidyNode_Start: + case TidyNode_End: + case TidyNode_StartEnd: + RETURN_TRUE; + default: + RETURN_FALSE; } - - RETURN_FALSE; } /* }}} */ |