diff options
| author | Andrea Faulds <ajf@ajf.me> | 2014-09-16 13:45:06 +0100 |
|---|---|---|
| committer | Andrea Faulds <ajf@ajf.me> | 2014-09-16 13:45:06 +0100 |
| commit | db72160e5ac2b267b9ffa23ad84e62e609382a44 (patch) | |
| tree | 6e50c2826f98308d500cc826934a503751d4d566 /ext/dom/processinginstruction.c | |
| parent | be88d0e5d4ab5fdf775f3e38cf054aa0451f0d36 (diff) | |
| parent | f469dc7429f2257aac6f46228302408608fbd62f (diff) | |
| download | php-git-db72160e5ac2b267b9ffa23ad84e62e609382a44.tar.gz | |
Merge branch 'master' into integer_semantics
Conflicts:
Zend/zend_operators.h
Diffstat (limited to 'ext/dom/processinginstruction.c')
| -rw-r--r-- | ext/dom/processinginstruction.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/ext/dom/processinginstruction.c b/ext/dom/processinginstruction.c index 36b159cc6e..a2bb1bd09f 100644 --- a/ext/dom/processinginstruction.c +++ b/ext/dom/processinginstruction.c @@ -54,7 +54,8 @@ PHP_METHOD(domprocessinginstruction, __construct) xmlNodePtr nodep = NULL, oldnode = NULL; dom_object *intern; char *name, *value = NULL; - int name_len, value_len, name_valid; + size_t name_len, value_len; + int name_valid; zend_error_handling error_handling; zend_replace_error_handling(EH_THROW, dom_domexception_class_entry, &error_handling TSRMLS_CC); @@ -126,7 +127,7 @@ int dom_processinginstruction_data_read(dom_object *obj, zval *retval TSRMLS_DC) } if ((content = xmlNodeGetContent(nodep)) != NULL) { - ZVAL_STRING(retval, content); + ZVAL_STRING(retval, (char *) content); xmlFree(content); } else { ZVAL_EMPTY_STRING(retval); @@ -147,9 +148,9 @@ int dom_processinginstruction_data_write(dom_object *obj, zval *newval TSRMLS_DC str = zval_get_string(newval); - xmlNodeSetContentLen(nodep, str->val, str->len + 1); + xmlNodeSetContentLen(nodep, (xmlChar *) str->val, str->len + 1); - STR_RELEASE(str); + zend_string_release(str); return SUCCESS; } |