summaryrefslogtreecommitdiff
path: root/ext/tidy/tidy.c
diff options
context:
space:
mode:
authorChristoph M. Becker <cmbecker69@gmx.de>2020-10-07 17:47:40 +0200
committerChristoph M. Becker <cmbecker69@gmx.de>2020-10-07 17:48:12 +0200
commitff3878adeb5e73e514a0f7a1cb367a3b350301c9 (patch)
tree6eba0e89da9aaa81709af35de867243c1929aec9 /ext/tidy/tidy.c
parent683c988493920e033f0c7f5455ebfc3825c38887 (diff)
parente68acd031db679ff882710ce89bfac67e65bd9f0 (diff)
downloadphp-git-ff3878adeb5e73e514a0f7a1cb367a3b350301c9.tar.gz
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3: Fix #77040: tidyNode::isHtml() is completely broken
Diffstat (limited to 'ext/tidy/tidy.c')
-rw-r--r--ext/tidy/tidy.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/ext/tidy/tidy.c b/ext/tidy/tidy.c
index 295ca8d8f0..bf38faf224 100644
--- a/ext/tidy/tidy.c
+++ b/ext/tidy/tidy.c
@@ -1798,11 +1798,14 @@ static TIDY_NODE_METHOD(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;
}
/* }}} */