diff options
| author | Rob Richards <rrichards@php.net> | 2004-05-16 10:30:16 +0000 |
|---|---|---|
| committer | Rob Richards <rrichards@php.net> | 2004-05-16 10:30:16 +0000 |
| commit | 9e3956b313ef74f0e7c4881ca39c9395036d45bb (patch) | |
| tree | f14ce42a575f226ac068b10f216df59c04c32896 /ext/dom/attr.c | |
| parent | 92c72cb8d85d9115c08f857f2237bd532848a786 (diff) | |
| download | php-git-9e3956b313ef74f0e7c4881ca39c9395036d45bb.tar.gz | |
constructors throw DOMException
add DOM_PHP_ERR DomException code
validate tagnames in constructors
use C style comments
update TODO
Diffstat (limited to 'ext/dom/attr.c')
| -rw-r--r-- | ext/dom/attr.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/ext/dom/attr.c b/ext/dom/attr.c index aa9f158e56..b574b1abec 100644 --- a/ext/dom/attr.c +++ b/ext/dom/attr.c @@ -52,23 +52,29 @@ PHP_METHOD(domattr, __construct) xmlNodePtr oldnode = NULL; dom_object *intern; char *name, *value = NULL; - int name_len, value_len; + int name_len, value_len, name_valid; + php_set_error_handling(EH_THROW, dom_domexception_class_entry TSRMLS_CC); if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os|s", &id, dom_attr_class_entry, &name, &name_len, &value, &value_len) == FAILURE) { + php_std_error_handling(); return; } + php_std_error_handling(); intern = (dom_object *)zend_object_store_get_object(id TSRMLS_CC); - if (name_len == 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Attribute name is required"); + name_valid = xmlValidateName((xmlChar *) name, 0); + if (name_valid != 0) { + php_dom_throw_error(INVALID_CHARACTER_ERR, 1 TSRMLS_CC); RETURN_FALSE; } nodep = xmlNewProp(NULL, (xmlChar *) name, value); - if (!nodep) + if (!nodep) { + php_dom_throw_error(INVALID_STATE_ERR, 1 TSRMLS_CC); RETURN_FALSE; + } if (intern != NULL) { oldnode = (xmlNodePtr)intern->ptr; |