summaryrefslogtreecommitdiff
path: root/ext/tidy/tidy.c
diff options
context:
space:
mode:
authorNuno Lopes <nlopess@php.net>2007-09-20 22:25:06 +0000
committerNuno Lopes <nlopess@php.net>2007-09-20 22:25:06 +0000
commitfa0efe45e0540c756c7f5f16e724f65313fbec2e (patch)
tree97b1ad42a63d56a2afa49cafe14d593c6831d7fd /ext/tidy/tidy.c
parentc70e307e772c199de7a279fc098ea7e32d19afff (diff)
downloadphp-git-fa0efe45e0540c756c7f5f16e724f65313fbec2e.tar.gz
fix crash when fetching a node type that doesnt exist
# reported in a manual user note
Diffstat (limited to 'ext/tidy/tidy.c')
-rw-r--r--ext/tidy/tidy.c30
1 files changed, 18 insertions, 12 deletions
diff --git a/ext/tidy/tidy.c b/ext/tidy/tidy.c
index ffed15523d..cb2525ce0e 100644
--- a/ext/tidy/tidy.c
+++ b/ext/tidy/tidy.c
@@ -870,35 +870,41 @@ static void *php_tidy_get_opt_val(PHPTidyDoc *ptdoc, TidyOption opt, TidyOptionT
return NULL;
}
-static void php_tidy_create_node(INTERNAL_FUNCTION_PARAMETERS, tidy_base_nodetypes node)
+static void php_tidy_create_node(INTERNAL_FUNCTION_PARAMETERS, tidy_base_nodetypes node_type)
{
PHPTidyObj *newobj;
+ TidyNode node;
TIDY_FETCH_OBJECT;
- tidy_instanciate(tidy_ce_node, return_value TSRMLS_CC);
- newobj = (PHPTidyObj *) zend_object_store_get_object(return_value TSRMLS_CC);
- newobj->type = is_node;
- newobj->ptdoc = obj->ptdoc;
- newobj->ptdoc->ref_count++;
-
- switch(node) {
+ switch (node_type) {
case is_root_node:
- newobj->node = tidyGetRoot(newobj->ptdoc->doc);
+ node = tidyGetRoot(obj->ptdoc->doc);
break;
case is_html_node:
- newobj->node = tidyGetHtml(newobj->ptdoc->doc);
+ node = tidyGetHtml(obj->ptdoc->doc);
break;
case is_head_node:
- newobj->node = tidyGetHead(newobj->ptdoc->doc);
+ node = tidyGetHead(obj->ptdoc->doc);
break;
case is_body_node:
- newobj->node = tidyGetBody(newobj->ptdoc->doc);
+ node = tidyGetBody(obj->ptdoc->doc);
break;
}
+ if (!node) {
+ RETURN_NULL();
+ }
+
+ tidy_instanciate(tidy_ce_node, return_value TSRMLS_CC);
+ newobj = (PHPTidyObj *) zend_object_store_get_object(return_value TSRMLS_CC);
+ newobj->type = is_node;
+ newobj->ptdoc = obj->ptdoc;
+ newobj->node = node;
+ newobj->ptdoc->ref_count++;
+
tidy_add_default_properties(newobj, is_node TSRMLS_CC);
}