diff options
Diffstat (limited to 'ext/xml/xml.c')
| -rw-r--r-- | ext/xml/xml.c | 891 |
1 files changed, 433 insertions, 458 deletions
diff --git a/ext/xml/xml.c b/ext/xml/xml.c index 5d5c2e4c19..de10194998 100644 --- a/ext/xml/xml.c +++ b/ext/xml/xml.c @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 7 | +----------------------------------------------------------------------+ | Copyright (c) 1997-2016 The PHP Group | +----------------------------------------------------------------------+ @@ -62,6 +62,9 @@ ZEND_DECLARE_MODULE_GLOBALS(xml) /* {{{ dynamically loadable module stuff */ #ifdef COMPILE_DL_XML +#ifdef ZTS +ZEND_TSRMLS_CACHE_DEFINE() +#endif ZEND_GET_MODULE(xml) #endif /* COMPILE_DL_XML */ /* }}} */ @@ -75,17 +78,17 @@ PHP_MINIT_FUNCTION(xml); PHP_MINFO_FUNCTION(xml); static PHP_GINIT_FUNCTION(xml); -static void xml_parser_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC); -static void xml_set_handler(zval **, zval **); +static void xml_parser_dtor(zend_resource *rsrc); +static void xml_set_handler(zval *, zval *); inline static unsigned short xml_encode_iso_8859_1(unsigned char); inline static char xml_decode_iso_8859_1(unsigned short); inline static unsigned short xml_encode_us_ascii(unsigned char); inline static char xml_decode_us_ascii(unsigned short); -static zval *xml_call_handler(xml_parser *, zval *, zend_function *, int, zval **); -static zval *_xml_xmlchar_zval(const XML_Char *, int, const XML_Char *); +static void xml_call_handler(xml_parser *, zval *, zend_function *, int, zval *, zval *); +static void _xml_xmlchar_zval(const XML_Char *, int, const XML_Char *, zval *); static int _xml_xmlcharlen(const XML_Char *); static void _xml_add_to_info(xml_parser *parser,char *name); -inline static char *_xml_decode_tag(xml_parser *parser, const char *tag); +inline static zend_string *_xml_decode_tag(xml_parser *parser, const char *tag); void _xml_startElementHandler(void *, const XML_Char *, const XML_Char **); void _xml_endElementHandler(void *, const XML_Char *); @@ -266,7 +269,7 @@ zend_module_entry xml_module_entry = { NULL, /* per-request startup function */ NULL, /* per-request shutdown function */ PHP_MINFO(xml), /* information function */ - NO_VERSION_YET, + PHP_XML_VERSION, PHP_MODULE_GLOBALS(xml), /* globals descriptor */ PHP_GINIT(xml), /* globals ctor */ NULL, /* globals dtor */ @@ -294,7 +297,10 @@ static int le_xml_parser; /* {{{ startup, shutdown and info functions */ static PHP_GINIT_FUNCTION(xml) { - xml_globals->default_encoding = "UTF-8"; +#if defined(COMPILE_DL_XML) && defined(ZTS) + ZEND_TSRMLS_CACHE_UPDATE(); +#endif + xml_globals->default_encoding = (XML_Char*)"UTF-8"; } static void *php_xml_malloc_wrapper(size_t sz) @@ -377,53 +383,22 @@ PHP_MINFO_FUNCTION(xml) /* }}} */ /* {{{ extension-internal functions */ -static zval *_xml_resource_zval(long value) -{ - zval *ret; - TSRMLS_FETCH(); - - MAKE_STD_ZVAL(ret); - - Z_TYPE_P(ret) = IS_RESOURCE; - Z_LVAL_P(ret) = value; - - zend_list_addref(value); - - return ret; -} - -static zval *_xml_string_zval(const char *str) -{ - zval *ret; - int len = strlen(str); - MAKE_STD_ZVAL(ret); - - Z_TYPE_P(ret) = IS_STRING; - Z_STRLEN_P(ret) = len; - Z_STRVAL_P(ret) = estrndup(str, len); - return ret; -} -static zval *_xml_xmlchar_zval(const XML_Char *s, int len, const XML_Char *encoding) +static void _xml_xmlchar_zval(const XML_Char *s, int len, const XML_Char *encoding, zval *ret) { - zval *ret; - MAKE_STD_ZVAL(ret); - if (s == NULL) { ZVAL_FALSE(ret); - return ret; + return; } if (len == 0) { len = _xml_xmlcharlen(s); } - Z_TYPE_P(ret) = IS_STRING; - Z_STRVAL_P(ret) = xml_utf8_decode(s, len, &Z_STRLEN_P(ret), encoding); - return ret; + ZVAL_STR(ret, xml_utf8_decode(s, len, encoding)); } /* }}} */ /* {{{ xml_parser_dtor() */ -static void xml_parser_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC) +static void xml_parser_dtor(zend_resource *rsrc) { xml_parser *parser = (xml_parser *)rsrc->ptr; @@ -436,43 +411,43 @@ static void xml_parser_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC) efree(parser->ltags[ inx ]); efree(parser->ltags); } - if (parser->startElementHandler) { + if (!Z_ISUNDEF(parser->startElementHandler)) { zval_ptr_dtor(&parser->startElementHandler); } - if (parser->endElementHandler) { + if (!Z_ISUNDEF(parser->endElementHandler)) { zval_ptr_dtor(&parser->endElementHandler); } - if (parser->characterDataHandler) { + if (!Z_ISUNDEF(parser->characterDataHandler)) { zval_ptr_dtor(&parser->characterDataHandler); } - if (parser->processingInstructionHandler) { + if (!Z_ISUNDEF(parser->processingInstructionHandler)) { zval_ptr_dtor(&parser->processingInstructionHandler); } - if (parser->defaultHandler) { + if (!Z_ISUNDEF(parser->defaultHandler)) { zval_ptr_dtor(&parser->defaultHandler); } - if (parser->unparsedEntityDeclHandler) { + if (!Z_ISUNDEF(parser->unparsedEntityDeclHandler)) { zval_ptr_dtor(&parser->unparsedEntityDeclHandler); } - if (parser->notationDeclHandler) { + if (!Z_ISUNDEF(parser->notationDeclHandler)) { zval_ptr_dtor(&parser->notationDeclHandler); } - if (parser->externalEntityRefHandler) { + if (!Z_ISUNDEF(parser->externalEntityRefHandler)) { zval_ptr_dtor(&parser->externalEntityRefHandler); } - if (parser->unknownEncodingHandler) { + if (!Z_ISUNDEF(parser->unknownEncodingHandler)) { zval_ptr_dtor(&parser->unknownEncodingHandler); } - if (parser->startNamespaceDeclHandler) { + if (!Z_ISUNDEF(parser->startNamespaceDeclHandler)) { zval_ptr_dtor(&parser->startNamespaceDeclHandler); } - if (parser->endNamespaceDeclHandler) { + if (!Z_ISUNDEF(parser->endNamespaceDeclHandler)) { zval_ptr_dtor(&parser->endNamespaceDeclHandler); } if (parser->baseURI) { efree(parser->baseURI); } - if (parser->object) { + if (!Z_ISUNDEF(parser->object)) { zval_ptr_dtor(&parser->object); } @@ -481,89 +456,66 @@ static void xml_parser_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC) /* }}} */ /* {{{ xml_set_handler() */ -static void xml_set_handler(zval **handler, zval **data) +static void xml_set_handler(zval *handler, zval *data) { /* If we have already a handler, release it */ - if (*handler) { + if (handler) { zval_ptr_dtor(handler); } /* IS_ARRAY might indicate that we're using array($obj, 'method') syntax */ - if (Z_TYPE_PP(data) != IS_ARRAY && Z_TYPE_PP(data) != IS_OBJECT) { - + if (Z_TYPE_P(data) != IS_ARRAY && Z_TYPE_P(data) != IS_OBJECT) { convert_to_string_ex(data); - if (Z_STRLEN_PP(data) == 0) { - *handler = NULL; + if (Z_STRLEN_P(data) == 0) { + ZVAL_UNDEF(handler); return; } } - zval_add_ref(data); - - *handler = *data; + ZVAL_COPY(handler, data); } /* }}} */ /* {{{ xml_call_handler() */ -static zval *xml_call_handler(xml_parser *parser, zval *handler, zend_function *function_ptr, int argc, zval **argv) +static void xml_call_handler(xml_parser *parser, zval *handler, zend_function *function_ptr, int argc, zval *argv, zval *retval) { - int i; - TSRMLS_FETCH(); + int i; + ZVAL_UNDEF(retval); if (parser && handler && !EG(exception)) { - zval ***args; - zval *retval; int result; zend_fcall_info fci; - args = safe_emalloc(sizeof(zval **), argc, 0); - for (i = 0; i < argc; i++) { - args[i] = &argv[i]; - } - fci.size = sizeof(fci); fci.function_table = EG(function_table); - fci.function_name = handler; + ZVAL_COPY_VALUE(&fci.function_name, handler); fci.symbol_table = NULL; - fci.object_ptr = parser->object; - fci.retval_ptr_ptr = &retval; + fci.object = Z_OBJ(parser->object); + fci.retval = retval; fci.param_count = argc; - fci.params = args; + fci.params = argv; fci.no_separation = 0; /*fci.function_handler_cache = &function_ptr;*/ - result = zend_call_function(&fci, NULL TSRMLS_CC); + result = zend_call_function(&fci, NULL); if (result == FAILURE) { - zval **method; - zval **obj; + zval *method; + zval *obj; if (Z_TYPE_P(handler) == IS_STRING) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to call handler %s()", Z_STRVAL_P(handler)); + php_error_docref(NULL, E_WARNING, "Unable to call handler %s()", Z_STRVAL_P(handler)); } else if (Z_TYPE_P(handler) == IS_ARRAY && - zend_hash_index_find(Z_ARRVAL_P(handler), 0, (void **) &obj) == SUCCESS && - zend_hash_index_find(Z_ARRVAL_P(handler), 1, (void **) &method) == SUCCESS && - Z_TYPE_PP(obj) == IS_OBJECT && - Z_TYPE_PP(method) == IS_STRING) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to call handler %s::%s()", Z_OBJCE_PP(obj)->name, Z_STRVAL_PP(method)); - } else - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to call handler"); - } - - for (i = 0; i < argc; i++) { - zval_ptr_dtor(args[i]); + (obj = zend_hash_index_find(Z_ARRVAL_P(handler), 0)) != NULL && + (method = zend_hash_index_find(Z_ARRVAL_P(handler), 1)) != NULL && + Z_TYPE_P(obj) == IS_OBJECT && + Z_TYPE_P(method) == IS_STRING) { + php_error_docref(NULL, E_WARNING, "Unable to call handler %s::%s()", ZSTR_VAL(Z_OBJCE_P(obj)->name), Z_STRVAL_P(method)); + } else + php_error_docref(NULL, E_WARNING, "Unable to call handler"); } - efree(args); - - if (result == FAILURE) { - return NULL; - } else { - return EG(exception) ? NULL : retval; - } - } else { - for (i = 0; i < argc; i++) { - zval_ptr_dtor(&argv[i]); - } - return NULL; + } + for (i = 0; i < argc; i++) { + zval_ptr_dtor(&argv[i]); } } /* }}} */ @@ -602,7 +554,7 @@ static xml_encoding *xml_get_encoding(const XML_Char *name) xml_encoding *enc = &xml_encodings[0]; while (enc && enc->name) { - if (strcasecmp(name, enc->name) == 0) { + if (strcasecmp((char *)name, (char *)enc->name) == 0) { return enc; } enc++; @@ -611,16 +563,15 @@ static xml_encoding *xml_get_encoding(const XML_Char *name) } /* }}} */ -/* {{{ xml_utf8_encode */ -PHPAPI char *xml_utf8_encode(const char *s, int len, int *newlen, const XML_Char *encoding) +/* {{{ xml_utf8_encode() */ +PHP_XML_API zend_string *xml_utf8_encode(const char *s, size_t len, const XML_Char *encoding) { - int pos = len; - char *newbuf; + size_t pos = len; + zend_string *str; unsigned int c; unsigned short (*encoder)(unsigned char) = NULL; xml_encoding *enc = xml_get_encoding(encoding); - *newlen = 0; if (enc) { encoder = enc->encoding_function; } else { @@ -630,65 +581,63 @@ PHPAPI char *xml_utf8_encode(const char *s, int len, int *newlen, const XML_Char if (encoder == NULL) { /* If no encoder function was specified, return the data as-is. */ - newbuf = emalloc(len + 1); - memcpy(newbuf, s, len); - *newlen = len; - newbuf[*newlen] = '\0'; - return newbuf; + str = zend_string_init(s, len, 0); + return str; } /* This is the theoretical max (will never get beyond len * 2 as long * as we are converting from single-byte characters, though) */ - newbuf = safe_emalloc(len, 4, 1); + str = zend_string_safe_alloc(len, 4, 0, 0); + ZSTR_LEN(str) = 0; while (pos > 0) { c = encoder ? encoder((unsigned char)(*s)) : (unsigned short)(*s); if (c < 0x80) { - newbuf[(*newlen)++] = (char) c; + ZSTR_VAL(str)[ZSTR_LEN(str)++] = (char) c; } else if (c < 0x800) { - newbuf[(*newlen)++] = (0xc0 | (c >> 6)); - newbuf[(*newlen)++] = (0x80 | (c & 0x3f)); + ZSTR_VAL(str)[ZSTR_LEN(str)++] = (0xc0 | (c >> 6)); + ZSTR_VAL(str)[ZSTR_LEN(str)++] = (0x80 | (c & 0x3f)); } else if (c < 0x10000) { - newbuf[(*newlen)++] = (0xe0 | (c >> 12)); - newbuf[(*newlen)++] = (0xc0 | ((c >> 6) & 0x3f)); - newbuf[(*newlen)++] = (0x80 | (c & 0x3f)); + ZSTR_VAL(str)[ZSTR_LEN(str)++] = (0xe0 | (c >> 12)); + ZSTR_VAL(str)[ZSTR_LEN(str)++] = (0xc0 | ((c >> 6) & 0x3f)); + ZSTR_VAL(str)[ZSTR_LEN(str)++] = (0x80 | (c & 0x3f)); } else if (c < 0x200000) { - newbuf[(*newlen)++] = (0xf0 | (c >> 18)); - newbuf[(*newlen)++] = (0xe0 | ((c >> 12) & 0x3f)); - newbuf[(*newlen)++] = (0xc0 | ((c >> 6) & 0x3f)); - newbuf[(*newlen)++] = (0x80 | (c & 0x3f)); + ZSTR_VAL(str)[ZSTR_LEN(str)++] = (0xf0 | (c >> 18)); + ZSTR_VAL(str)[ZSTR_LEN(str)++] = (0xe0 | ((c >> 12) & 0x3f)); + ZSTR_VAL(str)[ZSTR_LEN(str)++] = (0xc0 | ((c >> 6) & 0x3f)); + ZSTR_VAL(str)[ZSTR_LEN(str)++] = (0x80 | (c & 0x3f)); } pos--; s++; } - newbuf[*newlen] = 0; - newbuf = erealloc(newbuf, (*newlen)+1); - return newbuf; + ZSTR_VAL(str)[ZSTR_LEN(str)] = '\0'; + str = zend_string_truncate(str, ZSTR_LEN(str), 0); + return str; } /* }}} */ -/* {{{ xml_utf8_decode */ -PHPAPI char *xml_utf8_decode(const XML_Char *s, int len, int *newlen, const XML_Char *encoding) +/* {{{ xml_utf8_decode() */ +PHP_XML_API zend_string *xml_utf8_decode(const XML_Char *s, size_t len, const XML_Char *encoding) { size_t pos = 0; - char *newbuf = emalloc(len + 1); unsigned int c; char (*decoder)(unsigned short) = NULL; xml_encoding *enc = xml_get_encoding(encoding); + zend_string *str; - *newlen = 0; if (enc) { decoder = enc->decoding_function; } + if (decoder == NULL) { /* If the target encoding was unknown, or no decoder function * was specified, return the UTF-8-encoded data as-is. */ - memcpy(newbuf, s, len); - *newlen = len; - newbuf[*newlen] = '\0'; - return newbuf; + str = zend_string_init((char *)s, len, 0); + return str; } - while (pos < (size_t)len) { + str = zend_string_alloc(len, 0); + ZSTR_LEN(str) = 0; + while (pos < len) { int status = FAILURE; c = php_next_utf8_char((const unsigned char*)s, (size_t) len, &pos, &status); @@ -696,14 +645,14 @@ PHPAPI char *xml_utf8_decode(const XML_Char *s, int len, int *newlen, const XML_ c = '?'; } - newbuf[*newlen] = decoder ? decoder(c) : c; - ++*newlen; + ZSTR_VAL(str)[ZSTR_LEN(str)++] = decoder ? decoder(c) : c; } - if (*newlen < len) { - newbuf = erealloc(newbuf, *newlen + 1); + ZSTR_VAL(str)[ZSTR_LEN(str)] = '\0'; + if (ZSTR_LEN(str) < len) { + str = zend_string_truncate(str, ZSTR_LEN(str), 0); } - newbuf[*newlen] = '\0'; - return newbuf; + + return str; } /* }}} */ @@ -721,7 +670,7 @@ static int _xml_xmlcharlen(const XML_Char *s) /* }}} */ /* {{{ _xml_zval_strdup() */ -PHPAPI char *_xml_zval_strdup(zval *val) +PHP_XML_API char *_xml_zval_strdup(zval *val) { if (Z_TYPE_P(val) == IS_STRING) { char *buf = emalloc(Z_STRLEN_P(val) + 1); @@ -733,42 +682,39 @@ PHPAPI char *_xml_zval_strdup(zval *val) } /* }}} */ -/* {{{ _xml_add_to_info */ +/* {{{ _xml_add_to_info() */ static void _xml_add_to_info(xml_parser *parser,char *name) { - zval **element, *values; + zval *element; - if (! parser->info) { + if (Z_ISUNDEF(parser->info)) { return; } - if (zend_hash_find(Z_ARRVAL_P(parser->info),name,strlen(name) + 1,(void **) &element) == FAILURE) { - MAKE_STD_ZVAL(values); - - array_init(values); - - zend_hash_update(Z_ARRVAL_P(parser->info), name, strlen(name)+1, (void *) &values, sizeof(zval*), (void **) &element); - } - - add_next_index_long(*element,parser->curtag); - + if ((element = zend_hash_str_find(Z_ARRVAL(parser->info), name, strlen(name))) == NULL) { + zval values; + array_init(&values); + element = zend_hash_str_update(Z_ARRVAL(parser->info), name, strlen(name), &values); + } + + add_next_index_long(element, parser->curtag); + parser->curtag++; } /* }}} */ /* {{{ _xml_decode_tag() */ -static char *_xml_decode_tag(xml_parser *parser, const char *tag) +static zend_string *_xml_decode_tag(xml_parser *parser, const char *tag) { - char *newstr; - int out_len; + zend_string *str; - newstr = xml_utf8_decode(tag, strlen(tag), &out_len, parser->target_encoding); + str = xml_utf8_decode((const XML_Char *)tag, strlen(tag), parser->target_encoding); if (parser->case_folding) { - php_strtoupper(newstr, out_len); + php_strtoupper(ZSTR_VAL(str), ZSTR_LEN(str)); } - return newstr; + return str; } /* }}} */ @@ -777,86 +723,84 @@ void _xml_startElementHandler(void *userData, const XML_Char *name, const XML_Ch { xml_parser *parser = (xml_parser *)userData; const char **attrs = (const char **) attributes; - char *tag_name; - char *att, *val; - int val_len; - zval *retval, *args[3]; + zend_string *att, *tag_name, *val; + zval retval, args[3]; if (parser) { parser->level++; - tag_name = _xml_decode_tag(parser, name); + tag_name = _xml_decode_tag(parser, (const char *)name); - if (parser->startElementHandler) { - args[0] = _xml_resource_zval(parser->index); - args[1] = _xml_string_zval(SKIP_TAGSTART((char *) tag_name)); - MAKE_STD_ZVAL(args[2]); - array_init(args[2]); + if (!Z_ISUNDEF(parser->startElementHandler)) { + ZVAL_COPY(&args[0], &parser->index); + ZVAL_STRING(&args[1], SKIP_TAGSTART(ZSTR_VAL(tag_name))); + array_init(&args[2]); while (attributes && *attributes) { - att = _xml_decode_tag(parser, attributes[0]); - val = xml_utf8_decode(attributes[1], strlen(attributes[1]), &val_len, parser->target_encoding); + zval tmp; - add_assoc_stringl(args[2], att, val, val_len, 0); + att = _xml_decode_tag(parser, (const char *)attributes[0]); + val = xml_utf8_decode(attributes[1], strlen((char *)attributes[1]), parser->target_encoding); - attributes += 2; + ZVAL_STR(&tmp, val); + zend_symtable_update(Z_ARRVAL(args[2]), att, &tmp); - efree(att); - } + attributes += 2; - if ((retval = xml_call_handler(parser, parser->startElementHandler, parser->startElementPtr, 3, args))) { - zval_ptr_dtor(&retval); + zend_string_release(att); } - } + + xml_call_handler(parser, &parser->startElementHandler, parser->startElementPtr, 3, args, &retval); + zval_ptr_dtor(&retval); + } - if (parser->data) { + if (!Z_ISUNDEF(parser->data)) { if (parser->level <= XML_MAXLEVEL) { - zval *tag, *atr; + zval tag, atr; int atcnt = 0; - MAKE_STD_ZVAL(tag); - MAKE_STD_ZVAL(atr); - - array_init(tag); - array_init(atr); + array_init(&tag); + array_init(&atr); - _xml_add_to_info(parser,SKIP_TAGSTART((char *) tag_name)); + _xml_add_to_info(parser, ZSTR_VAL(tag_name) + parser->toffset); - add_assoc_string(tag,"tag",SKIP_TAGSTART((char *) tag_name),1); - add_assoc_string(tag,"type","open",1); - add_assoc_long(tag,"level",parser->level); + add_assoc_string(&tag, "tag", SKIP_TAGSTART(ZSTR_VAL(tag_name))); /* cast to avoid gcc-warning */ + add_assoc_string(&tag, "type", "open"); + add_assoc_long(&tag, "level", parser->level); - parser->ltags[parser->level-1] = estrdup(tag_name); + parser->ltags[parser->level-1] = estrdup(ZSTR_VAL(tag_name)); parser->lastwasopen = 1; attributes = (const XML_Char **) attrs; while (attributes && *attributes) { - att = _xml_decode_tag(parser, attributes[0]); - val = xml_utf8_decode(attributes[1], strlen(attributes[1]), &val_len, parser->target_encoding); + zval tmp; - add_assoc_stringl(atr,att,val,val_len,0); + att = _xml_decode_tag(parser, (const char *)attributes[0]); + val = xml_utf8_decode(attributes[1], strlen((char *)attributes[1]), parser->target_encoding); + + ZVAL_STR(&tmp, val); + zend_symtable_update(Z_ARRVAL(atr), att, &tmp); atcnt++; attributes += 2; - efree(att); + zend_string_release(att); } if (atcnt) { - zend_hash_add(Z_ARRVAL_P(tag),"attributes",sizeof("attributes"),&atr,sizeof(zval*),NULL); + zend_hash_str_add(Z_ARRVAL(tag), "attributes", sizeof("attributes") - 1, &atr); } else { zval_ptr_dtor(&atr); } - zend_hash_next_index_insert(Z_ARRVAL_P(parser->data),&tag,sizeof(zval*),(void *) &parser->ctag); + parser->ctag = zend_hash_next_index_insert(Z_ARRVAL(parser->data), &tag); } else if (parser->level == (XML_MAXLEVEL + 1)) { - TSRMLS_FETCH(); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Maximum depth exceeded - Results truncated"); + php_error_docref(NULL, E_WARNING, "Maximum depth exceeded - Results truncated"); } } - efree(tag_name); + zend_string_release(tag_name); } } /* }}} */ @@ -865,45 +809,42 @@ void _xml_startElementHandler(void *userData, const XML_Char *name, const XML_Ch void _xml_endElementHandler(void *userData, const XML_Char *name) { xml_parser *parser = (xml_parser *)userData; - char *tag_name; + zend_string *tag_name; if (parser) { - zval *retval, *args[2]; + zval retval, args[2]; - tag_name = _xml_decode_tag(parser, name); + tag_name = _xml_decode_tag(parser, (const char *)name); - if (parser->endElementHandler) { - args[0] = _xml_resource_zval(parser->index); - args[1] = _xml_string_zval(SKIP_TAGSTART((char *) tag_name)); + if (!Z_ISUNDEF(parser->endElementHandler)) { + ZVAL_COPY(&args[0], &parser->index); + ZVAL_STRING(&args[1], SKIP_TAGSTART(ZSTR_VAL(tag_name))); - if ((retval = xml_call_handler(parser, parser->endElementHandler, parser->endElementPtr, 2, args))) { - zval_ptr_dtor(&retval); - } - } + xml_call_handler(parser, &parser->endElementHandler, parser->endElementPtr, 2, args, &retval); + zval_ptr_dtor(&retval); + } - if (parser->data) { - zval *tag; + if (!Z_ISUNDEF(parser->data)) { + zval tag; if (parser->lastwasopen) { - add_assoc_string(*(parser->ctag),"type","complete",1); + add_assoc_string(parser->ctag, "type", "complete"); } else { - MAKE_STD_ZVAL(tag); - - array_init(tag); - - _xml_add_to_info(parser,SKIP_TAGSTART((char *) tag_name)); - - add_assoc_string(tag,"tag",SKIP_TAGSTART((char *) tag_name),1); - add_assoc_string(tag,"type","close",1); - add_assoc_long(tag,"level",parser->level); - - zend_hash_next_index_insert(Z_ARRVAL_P(parser->data),&tag,sizeof(zval*),NULL); + array_init(&tag); + + _xml_add_to_info(parser, ZSTR_VAL(tag_name) + parser->toffset); + + add_assoc_string(&tag, "tag", SKIP_TAGSTART(ZSTR_VAL(tag_name))); /* cast to avoid gcc-warning */ + add_assoc_string(&tag, "type", "close"); + add_assoc_long(&tag, "level", parser->level); + + zend_hash_next_index_insert(Z_ARRVAL(parser->data), &tag); } parser->lastwasopen = 0; } - efree(tag_name); + zend_string_release(tag_name); if ((parser->ltags) && (parser->level <= XML_MAXLEVEL)) { efree(parser->ltags[parser->level-1]); @@ -920,33 +861,30 @@ void _xml_characterDataHandler(void *userData, const XML_Char *s, int len) xml_parser *parser = (xml_parser *)userData; if (parser) { - zval *retval, *args[2]; + zval retval, args[2]; - if (parser->characterDataHandler) { - args[0] = _xml_resource_zval(parser->index); - args[1] = _xml_xmlchar_zval(s, len, parser->target_encoding); - if ((retval = xml_call_handler(parser, parser->characterDataHandler, parser->characterDataPtr, 2, args))) { - zval_ptr_dtor(&retval); - } - } + if (!Z_ISUNDEF(parser->characterDataHandler)) { + ZVAL_COPY(&args[0], &parser->index); + _xml_xmlchar_zval(s, len, parser->target_encoding, &args[1]); + xml_call_handler(parser, &parser->characterDataHandler, parser->characterDataPtr, 2, args, &retval); + zval_ptr_dtor(&retval); + } - if (parser->data) { + if (!Z_ISUNDEF(parser->data)) { int i; int doprint = 0; - - char *decoded_value; - int decoded_len; - - decoded_value = xml_utf8_decode(s,len,&decoded_len,parser->target_encoding); - for (i = 0; i < decoded_len; i++) { - switch (decoded_value[i]) { - case ' ': - case '\t': - case '\n': - continue; - default: - doprint = 1; - break; + zend_string *decoded_value; + + decoded_value = xml_utf8_decode(s, len, parser->target_encoding); + for (i = 0; i < ZSTR_LEN(decoded_value); i++) { + switch (ZSTR_VAL(decoded_value)[i]) { + case ' ': + case '\t': + case '\n': + continue; + default: + doprint = 1; + break; } if (doprint) { break; @@ -954,61 +892,56 @@ void _xml_characterDataHandler(void *userData, const XML_Char *s, int len) } if (doprint || (! parser->skipwhite)) { if (parser->lastwasopen) { - zval **myval; - + zval *myval; + /* check if the current tag already has a value - if yes append to that! */ - if (zend_hash_find(Z_ARRVAL_PP(parser->ctag),"value",sizeof("value"),(void **) &myval) == SUCCESS) { - int newlen = Z_STRLEN_PP(myval) + decoded_len; - Z_STRVAL_PP(myval) = erealloc(Z_STRVAL_PP(myval),newlen+1); - strncpy(Z_STRVAL_PP(myval) + Z_STRLEN_PP(myval), decoded_value, decoded_len + 1); - Z_STRLEN_PP(myval) += decoded_len; - efree(decoded_value); + if ((myval = zend_hash_str_find(Z_ARRVAL_P(parser->ctag), "value", sizeof("value") - 1))) { + int newlen = Z_STRLEN_P(myval) + ZSTR_LEN(decoded_value); + Z_STR_P(myval) = zend_string_extend(Z_STR_P(myval), newlen, 0); + strncpy(Z_STRVAL_P(myval) + Z_STRLEN_P(myval) - ZSTR_LEN(decoded_value), + ZSTR_VAL(decoded_value), ZSTR_LEN(decoded_value) + 1); + zend_string_release(decoded_value); } else { - add_assoc_string(*(parser->ctag),"value",decoded_value,0); + add_assoc_str(parser->ctag, "value", decoded_value); } } else { - zval *tag; - zval **curtag, **mytype, **myval; - HashPosition hpos=NULL; - - zend_hash_internal_pointer_end_ex(Z_ARRVAL_P(parser->data), &hpos); - - if (hpos && (zend_hash_get_current_data_ex(Z_ARRVAL_P(parser->data), (void **) &curtag, &hpos) == SUCCESS)) { - if (zend_hash_find(Z_ARRVAL_PP(curtag),"type",sizeof("type"),(void **) &mytype) == SUCCESS) { - if (!strcmp(Z_STRVAL_PP(mytype), "cdata")) { - if (zend_hash_find(Z_ARRVAL_PP(curtag),"value",sizeof("value"),(void **) &myval) == SUCCESS) { - int newlen = Z_STRLEN_PP(myval) + decoded_len; - Z_STRVAL_PP(myval) = erealloc(Z_STRVAL_PP(myval),newlen+1); - strncpy(Z_STRVAL_PP(myval) + Z_STRLEN_PP(myval), decoded_value, decoded_len + 1); - Z_STRLEN_PP(myval) += decoded_len; - efree(decoded_value); + zval tag; + zval *curtag, *mytype, *myval; + + ZEND_HASH_REVERSE_FOREACH_VAL(Z_ARRVAL(parser->data), curtag) { + if ((mytype = zend_hash_str_find(Z_ARRVAL_P(curtag),"type", sizeof("type") - 1))) { + if (!strcmp(Z_STRVAL_P(mytype), "cdata")) { + if ((myval = zend_hash_str_find(Z_ARRVAL_P(curtag), "value", sizeof("value") - 1))) { + int newlen = Z_STRLEN_P(myval) + ZSTR_LEN(decoded_value); + Z_STR_P(myval) = zend_string_extend(Z_STR_P(myval), newlen, 0); + strncpy(Z_STRVAL_P(myval) + Z_STRLEN_P(myval) - ZSTR_LEN(decoded_value), + ZSTR_VAL(decoded_value), ZSTR_LEN(decoded_value) + 1); + zend_string_release(decoded_value); return; } } } - } + break; + } ZEND_HASH_FOREACH_END(); if (parser->level <= XML_MAXLEVEL && parser->level > 0) { - MAKE_STD_ZVAL(tag); - - array_init(tag); + array_init(&tag); _xml_add_to_info(parser,SKIP_TAGSTART(parser->ltags[parser->level-1])); - add_assoc_string(tag,"tag",SKIP_TAGSTART(parser->ltags[parser->level-1]),1); - add_assoc_string(tag,"value",decoded_value,0); - add_assoc_string(tag,"type","cdata",1); - add_assoc_long(tag,"level",parser->level); + add_assoc_string(&tag, "tag", SKIP_TAGSTART(parser->ltags[parser->level-1])); + add_assoc_str(&tag, "value", decoded_value); + add_assoc_string(&tag, "type", "cdata"); + add_assoc_long(&tag, "level", parser->level); - zend_hash_next_index_insert(Z_ARRVAL_P(parser->data),&tag,sizeof(zval*),NULL); + zend_hash_next_index_insert(Z_ARRVAL(parser->data), &tag); } else if (parser->level == (XML_MAXLEVEL + 1)) { - TSRMLS_FETCH(); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Maximum depth exceeded - Results truncated"); + php_error_docref(NULL, E_WARNING, "Maximum depth exceeded - Results truncated"); } } } else { - efree(decoded_value); + zend_string_release(decoded_value); } } } @@ -1020,15 +953,14 @@ void _xml_processingInstructionHandler(void *userData, const XML_Char *target, c { xml_parser *parser = (xml_parser *)userData; - if (parser && parser->processingInstructionHandler) { - zval *retval, *args[3]; + if (parser && !Z_ISUNDEF(parser->processingInstructionHandler)) { + zval retval, args[3]; - args[0] = _xml_resource_zval(parser->index); - args[1] = _xml_xmlchar_zval(target, 0, parser->target_encoding); - args[2] = _xml_xmlchar_zval(data, 0, parser->target_encoding); - if ((retval = xml_call_handler(parser, parser->processingInstructionHandler, parser->processingInstructionPtr, 3, args))) { - zval_ptr_dtor(&retval); - } + ZVAL_COPY(&args[0], &parser->index); + _xml_xmlchar_zval(target, 0, parser->target_encoding, &args[1]); + _xml_xmlchar_zval(data, 0, parser->target_encoding, &args[2]); + xml_call_handler(parser, &parser->processingInstructionHandler, parser->processingInstructionPtr, 3, args, &retval); + zval_ptr_dtor(&retval); } } /* }}} */ @@ -1038,14 +970,13 @@ void _xml_defaultHandler(void *userData, const XML_Char *s, int len) { xml_parser *parser = (xml_parser *)userData; - if (parser && parser->defaultHandler) { - zval *retval, *args[2]; + if (parser && !Z_ISUNDEF(parser->defaultHandler)) { + zval retval, args[2]; - args[0] = _xml_resource_zval(parser->index); - args[1] = _xml_xmlchar_zval(s, len, parser->target_encoding); - if ((retval = xml_call_handler(parser, parser->defaultHandler, parser->defaultPtr, 2, args))) { - zval_ptr_dtor(&retval); - } + ZVAL_COPY(&args[0], &parser->index); + _xml_xmlchar_zval(s, len, parser->target_encoding, &args[1]); + xml_call_handler(parser, &parser->defaultHandler, parser->defaultPtr, 2, args, &retval); + zval_ptr_dtor(&retval); } } /* }}} */ @@ -1060,18 +991,17 @@ void _xml_unparsedEntityDeclHandler(void *userData, { xml_parser *parser = (xml_parser *)userData; - if (parser && parser->unparsedEntityDeclHandler) { - zval *retval, *args[6]; + if (parser && !Z_ISUNDEF(parser->unparsedEntityDeclHandler)) { + zval retval, args[6]; - args[0] = _xml_resource_zval(parser->index); - args[1] = _xml_xmlchar_zval(entityName, 0, parser->target_encoding); - args[2] = _xml_xmlchar_zval(base, 0, parser->target_encoding); - args[3] = _xml_xmlchar_zval(systemId, 0, parser->target_encoding); - args[4] = _xml_xmlchar_zval(publicId, 0, parser->target_encoding); - args[5] = _xml_xmlchar_zval(notationName, 0, parser->target_encoding); - if ((retval = xml_call_handler(parser, parser->unparsedEntityDeclHandler, parser->unparsedEntityDeclPtr, 6, args))) { - zval_ptr_dtor(&retval); - } + ZVAL_COPY(&args[0], &parser->index); + _xml_xmlchar_zval(entityName, 0, parser->target_encoding, &args[1]); + _xml_xmlchar_zval(base, 0, parser->target_encoding, &args[2]); + _xml_xmlchar_zval(systemId, 0, parser->target_encoding, &args[3]); + _xml_xmlchar_zval(publicId, 0, parser->target_encoding, &args[4]); + _xml_xmlchar_zval(notationName, 0, parser->target_encoding, &args[5]); + xml_call_handler(parser, &parser->unparsedEntityDeclHandler, parser->unparsedEntityDeclPtr, 6, args, &retval); + zval_ptr_dtor(&retval); } } /* }}} */ @@ -1085,17 +1015,16 @@ void _xml_notationDeclHandler(void *userData, { xml_parser *parser = (xml_parser *)userData; - if (parser && parser->notationDeclHandler) { - zval *retval, *args[5]; + if (parser && !Z_ISUNDEF(parser->notationDeclHandler)) { + zval retval, args[5]; - args[0] = _xml_resource_zval(parser->index); - args[1] = _xml_xmlchar_zval(notationName, 0, parser->target_encoding); - args[2] = _xml_xmlchar_zval(base, 0, parser->target_encoding); - args[3] = _xml_xmlchar_zval(systemId, 0, parser->target_encoding); - args[4] = _xml_xmlchar_zval(publicId, 0, parser->target_encoding); - if ((retval = xml_call_handler(parser, parser->notationDeclHandler, parser->notationDeclPtr, 5, args))) { - zval_ptr_dtor(&retval); - } + ZVAL_COPY(&args[0], &parser->index); + _xml_xmlchar_zval(notationName, 0, parser->target_encoding, &args[1]); + _xml_xmlchar_zval(base, 0, parser->target_encoding, &args[2]); + _xml_xmlchar_zval(systemId, 0, parser->target_encoding, &args[3]); + _xml_xmlchar_zval(publicId, 0, parser->target_encoding, &args[4]); + xml_call_handler(parser, &parser->notationDeclHandler, parser->notationDeclPtr, 5, args, &retval); + zval_ptr_dtor(&retval); } } /* }}} */ @@ -1110,18 +1039,18 @@ int _xml_externalEntityRefHandler(XML_Parser parserPtr, xml_parser *parser = XML_GetUserData(parserPtr); int ret = 0; /* abort if no handler is set (should be configurable?) */ - if (parser && parser->externalEntityRefHandler) { - zval *retval, *args[5]; - - args[0] = _xml_resource_zval(parser->index); - args[1] = _xml_xmlchar_zval(openEntityNames, 0, parser->target_encoding); - args[2] = _xml_xmlchar_zval(base, 0, parser->target_encoding); - args[3] = _xml_xmlchar_zval(systemId, 0, parser->target_encoding); - args[4] = _xml_xmlchar_zval(publicId, 0, parser->target_encoding); - if ((retval = xml_call_handler(parser, parser->externalEntityRefHandler, parser->externalEntityRefPtr, 5, args))) { - convert_to_long(retval); - ret = Z_LVAL_P(retval); - efree(retval); + if (parser && !Z_ISUNDEF(parser->externalEntityRefHandler)) { + zval retval, args[5]; + + ZVAL_COPY(&args[0], &parser->index); + _xml_xmlchar_zval(openEntityNames, 0, parser->target_encoding, &args[1]); + _xml_xmlchar_zval(base, 0, parser->target_encoding, &args[2]); + _xml_xmlchar_zval(systemId, 0, parser->target_encoding, &args[3]); + _xml_xmlchar_zval(publicId, 0, parser->target_encoding, &args[4]); + xml_call_handler(parser, &parser->externalEntityRefHandler, parser->externalEntityRefPtr, 5, args, &retval); + if (!Z_ISUNDEF(retval)) { + convert_to_long(&retval); + ret = Z_LVAL(retval); } else { ret = 0; } @@ -1135,15 +1064,14 @@ void _xml_startNamespaceDeclHandler(void *userData,const XML_Char *prefix, const { xml_parser *parser = (xml_parser *)userData; - if (parser && parser->startNamespaceDeclHandler) { - zval *retval, *args[3]; + if (parser && !Z_ISUNDEF(parser->startNamespaceDeclHandler)) { + zval retval, args[3]; - args[0] = _xml_resource_zval(parser->index); - args[1] = _xml_xmlchar_zval(prefix, 0, parser->target_encoding); - args[2] = _xml_xmlchar_zval(uri, 0, parser->target_encoding); - if ((retval = xml_call_handler(parser, parser->startNamespaceDeclHandler, parser->startNamespaceDeclPtr, 3, args))) { - zval_ptr_dtor(&retval); - } + ZVAL_COPY(&args[0], &parser->index); + _xml_xmlchar_zval(prefix, 0, parser->target_encoding, &args[1]); + _xml_xmlchar_zval(uri, 0, parser->target_encoding, &args[2]); + xml_call_handler(parser, &parser->startNamespaceDeclHandler, parser->startNamespaceDeclPtr, 3, args, &retval); + zval_ptr_dtor(&retval); } } /* }}} */ @@ -1153,14 +1081,13 @@ void _xml_endNamespaceDeclHandler(void *userData, const XML_Char *prefix) { xml_parser *parser = (xml_parser *)userData; - if (parser && parser->endNamespaceDeclHandler) { - zval *retval, *args[2]; + if (parser && !Z_ISUNDEF(parser->endNamespaceDeclHandler)) { + zval retval, args[2]; - args[0] = _xml_resource_zval(parser->index); - args[1] = _xml_xmlchar_zval(prefix, 0, parser->target_encoding); - if ((retval = xml_call_handler(parser, parser->endNamespaceDeclHandler, parser->endNamespaceDeclPtr, 2, args))) { - zval_ptr_dtor(&retval); - } + ZVAL_COPY(&args[0], &parser->index); + _xml_xmlchar_zval(prefix, 0, parser->target_encoding, &args[1]); + xml_call_handler(parser, &parser->endNamespaceDeclHandler, parser->endNamespaceDeclPtr, 2, args, &retval); + zval_ptr_dtor(&retval); } } /* }}} */ @@ -1173,14 +1100,14 @@ static void php_xml_parser_create_impl(INTERNAL_FUNCTION_PARAMETERS, int ns_supp int auto_detect = 0; char *encoding_param = NULL; - int encoding_param_len = 0; + size_t encoding_param_len = 0; char *ns_param = NULL; - int ns_param_len = 0; - + size_t ns_param_len = 0; + XML_Char *encoding; - - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, (ns_support ? "|ss": "|s"), &encoding_param, &encoding_param_len, &ns_param, &ns_param_len) == FAILURE) { + + if (zend_parse_parameters(ZEND_NUM_ARGS(), (ns_support ? "|ss": "|s"), &encoding_param, &encoding_param_len, &ns_param, &ns_param_len) == FAILURE) { RETURN_FALSE; } @@ -1192,13 +1119,13 @@ static void php_xml_parser_create_impl(INTERNAL_FUNCTION_PARAMETERS, int ns_supp encoding = XML(default_encoding); auto_detect = 1; } else if (strcasecmp(encoding_param, "ISO-8859-1") == 0) { - encoding = "ISO-8859-1"; + encoding = (XML_Char*)"ISO-8859-1"; } else if (strcasecmp(encoding_param, "UTF-8") == 0) { - encoding = "UTF-8"; + encoding = (XML_Char*)"UTF-8"; } else if (strcasecmp(encoding_param, "US-ASCII") == 0) { - encoding = "US-ASCII"; + encoding = (XML_Char*)"US-ASCII"; } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "unsupported source encoding \"%s\"", encoding_param); + php_error_docref(NULL, E_WARNING, "unsupported source encoding \"%s\"", encoding_param); RETURN_FALSE; } } else { @@ -1211,17 +1138,16 @@ static void php_xml_parser_create_impl(INTERNAL_FUNCTION_PARAMETERS, int ns_supp parser = ecalloc(1, sizeof(xml_parser)); parser->parser = XML_ParserCreate_MM((auto_detect ? NULL : encoding), - &php_xml_mem_hdlrs, ns_param); + &php_xml_mem_hdlrs, (XML_Char*)ns_param); parser->target_encoding = encoding; parser->case_folding = 1; - parser->object = NULL; parser->isparsing = 0; XML_SetUserData(parser->parser, parser); - ZEND_REGISTER_RESOURCE(return_value, parser,le_xml_parser); - parser->index = Z_LVAL_P(return_value); + RETVAL_RES(zend_register_resource(parser, le_xml_parser)); + ZVAL_COPY(&parser->index, return_value); } /* }}} */ @@ -1248,14 +1174,16 @@ PHP_FUNCTION(xml_set_object) xml_parser *parser; zval *pind, *mythis; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ro", &pind, &mythis) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "ro/", &pind, &mythis) == FAILURE) { return; } - ZEND_FETCH_RESOURCE(parser,xml_parser *, &pind, -1, "XML Parser", le_xml_parser); + if ((parser = (xml_parser *)zend_fetch_resource(Z_RES_P(pind), "XML Parser", le_xml_parser)) == NULL) { + RETURN_FALSE; + } /* please leave this commented - or ask thies@thieso.net before doing it (again) */ - if (parser->object) { + if (!Z_ISUNDEF(parser->object)) { zval_ptr_dtor(&parser->object); } @@ -1264,8 +1192,7 @@ PHP_FUNCTION(xml_set_object) zval_add_ref(&parser->object); #endif */ - ALLOC_ZVAL(parser->object); - MAKE_COPY_ZVAL(&mythis, parser->object); + ZVAL_COPY(&parser->object, mythis); RETVAL_TRUE; } @@ -1276,13 +1203,15 @@ PHP_FUNCTION(xml_set_object) PHP_FUNCTION(xml_set_element_handler) { xml_parser *parser; - zval *pind, **shdl, **ehdl; + zval *pind, *shdl, *ehdl; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rZZ", &pind, &shdl, &ehdl) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "rzz", &pind, &shdl, &ehdl) == FAILURE) { return; } - ZEND_FETCH_RESOURCE(parser,xml_parser *, &pind, -1, "XML Parser", le_xml_parser); + if ((parser = (xml_parser *)zend_fetch_resource(Z_RES_P(pind), "XML Parser", le_xml_parser)) == NULL) { + RETURN_FALSE; + } xml_set_handler(&parser->startElementHandler, shdl); xml_set_handler(&parser->endElementHandler, ehdl); @@ -1296,13 +1225,15 @@ PHP_FUNCTION(xml_set_element_handler) PHP_FUNCTION(xml_set_character_data_handler) { xml_parser *parser; - zval *pind, **hdl; + zval *pind, *hdl; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rZ", &pind, &hdl) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "rz", &pind, &hdl) == FAILURE) { return; } - ZEND_FETCH_RESOURCE(parser,xml_parser *, &pind, -1, "XML Parser", le_xml_parser); + if ((parser = (xml_parser *)zend_fetch_resource(Z_RES_P(pind), "XML Parser", le_xml_parser)) == NULL) { + RETURN_FALSE; + } xml_set_handler(&parser->characterDataHandler, hdl); XML_SetCharacterDataHandler(parser->parser, _xml_characterDataHandler); @@ -1315,13 +1246,15 @@ PHP_FUNCTION(xml_set_character_data_handler) PHP_FUNCTION(xml_set_processing_instruction_handler) { xml_parser *parser; - zval *pind, **hdl; + zval *pind, *hdl; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rZ", &pind, &hdl) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "rz", &pind, &hdl) == FAILURE) { return; } - ZEND_FETCH_RESOURCE(parser,xml_parser *, &pind, -1, "XML Parser", le_xml_parser); + if ((parser = (xml_parser *)zend_fetch_resource(Z_RES_P(pind), "XML Parser", le_xml_parser)) == NULL) { + RETURN_FALSE; + } xml_set_handler(&parser->processingInstructionHandler, hdl); XML_SetProcessingInstructionHandler(parser->parser, _xml_processingInstructionHandler); @@ -1334,12 +1267,15 @@ PHP_FUNCTION(xml_set_processing_instruction_handler) PHP_FUNCTION(xml_set_default_handler) { xml_parser *parser; - zval *pind, **hdl; + zval *pind, *hdl; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rZ", &pind, &hdl) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "rz", &pind, &hdl) == FAILURE) { return; } - ZEND_FETCH_RESOURCE(parser,xml_parser *, &pind, -1, "XML Parser", le_xml_parser); + + if ((parser = (xml_parser *)zend_fetch_resource(Z_RES_P(pind), "XML Parser", le_xml_parser)) == NULL) { + RETURN_FALSE; + } xml_set_handler(&parser->defaultHandler, hdl); XML_SetDefaultHandler(parser->parser, _xml_defaultHandler); @@ -1352,13 +1288,15 @@ PHP_FUNCTION(xml_set_default_handler) PHP_FUNCTION(xml_set_unparsed_entity_decl_handler) { xml_parser *parser; - zval *pind, **hdl; + zval *pind, *hdl; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rZ", &pind, &hdl) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "rz", &pind, &hdl) == FAILURE) { return; } - ZEND_FETCH_RESOURCE(parser,xml_parser *, &pind, -1, "XML Parser", le_xml_parser); + if ((parser = (xml_parser *)zend_fetch_resource(Z_RES_P(pind), "XML Parser", le_xml_parser)) == NULL) { + RETURN_FALSE; + } xml_set_handler(&parser->unparsedEntityDeclHandler, hdl); XML_SetUnparsedEntityDeclHandler(parser->parser, _xml_unparsedEntityDeclHandler); @@ -1371,12 +1309,15 @@ PHP_FUNCTION(xml_set_unparsed_entity_decl_handler) PHP_FUNCTION(xml_set_notation_decl_handler) { xml_parser *parser; - zval *pind, **hdl; + zval *pind, *hdl; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rZ", &pind, &hdl) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "rz", &pind, &hdl) == FAILURE) { return; } - ZEND_FETCH_RESOURCE(parser,xml_parser *, &pind, -1, "XML Parser", le_xml_parser); + + if ((parser = (xml_parser *)zend_fetch_resource(Z_RES_P(pind), "XML Parser", le_xml_parser)) == NULL) { + RETURN_FALSE; + } xml_set_handler(&parser->notationDeclHandler, hdl); XML_SetNotationDeclHandler(parser->parser, _xml_notationDeclHandler); @@ -1389,12 +1330,15 @@ PHP_FUNCTION(xml_set_notation_decl_handler) PHP_FUNCTION(xml_set_external_entity_ref_handler) { xml_parser *parser; - zval *pind, **hdl; + zval *pind, *hdl; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rZ", &pind, &hdl) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "rz", &pind, &hdl) == FAILURE) { return; } - ZEND_FETCH_RESOURCE(parser,xml_parser *, &pind, -1, "XML Parser", le_xml_parser); + + if ((parser = (xml_parser *)zend_fetch_resource(Z_RES_P(pind), "XML Parser", le_xml_parser)) == NULL) { + RETURN_FALSE; + } xml_set_handler(&parser->externalEntityRefHandler, hdl); XML_SetExternalEntityRefHandler(parser->parser, (void *) _xml_externalEntityRefHandler); @@ -1407,13 +1351,15 @@ PHP_FUNCTION(xml_set_external_entity_ref_handler) PHP_FUNCTION(xml_set_start_namespace_decl_handler) { xml_parser *parser; - zval *pind, **hdl; + zval *pind, *hdl; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rZ", &pind, &hdl) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "rz", &pind, &hdl) == FAILURE) { return; } - ZEND_FETCH_RESOURCE(parser,xml_parser *, &pind, -1, "XML Parser", le_xml_parser); + if ((parser = (xml_parser *)zend_fetch_resource(Z_RES_P(pind), "XML Parser", le_xml_parser)) == NULL) { + RETURN_FALSE; + } xml_set_handler(&parser->startNamespaceDeclHandler, hdl); XML_SetStartNamespaceDeclHandler(parser->parser, _xml_startNamespaceDeclHandler); @@ -1426,13 +1372,15 @@ PHP_FUNCTION(xml_set_start_namespace_decl_handler) PHP_FUNCTION(xml_set_end_namespace_decl_handler) { xml_parser *parser; - zval *pind, **hdl; + zval *pind, *hdl; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rZ", &pind, &hdl) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "rz", &pind, &hdl) == FAILURE) { return; } - ZEND_FETCH_RESOURCE(parser,xml_parser *, &pind, -1, "XML Parser", le_xml_parser); + if ((parser = (xml_parser *)zend_fetch_resource(Z_RES_P(pind), "XML Parser", le_xml_parser)) == NULL) { + RETURN_FALSE; + } xml_set_handler(&parser->endNamespaceDeclHandler, hdl); XML_SetEndNamespaceDeclHandler(parser->parser, _xml_endNamespaceDeclHandler); @@ -1440,23 +1388,27 @@ PHP_FUNCTION(xml_set_end_namespace_decl_handler) } /* }}} */ -/* {{{ proto int xml_parse(resource parser, string data [, int isFinal]) +/* {{{ proto int xml_parse(resource parser, string data [, bool isFinal]) Start parsing an XML document */ PHP_FUNCTION(xml_parse) { xml_parser *parser; zval *pind; char *data; - int data_len, ret; - long isFinal = 0; + size_t data_len; + int ret; + zend_bool isFinal = 0; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs|l", &pind, &data, &data_len, &isFinal) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "rs|b", &pind, &data, &data_len, &isFinal) == FAILURE) { return; } - ZEND_FETCH_RESOURCE(parser,xml_parser *, &pind, -1, "XML Parser", le_xml_parser); + + if ((parser = (xml_parser *)zend_fetch_resource(Z_RES_P(pind), "XML Parser", le_xml_parser)) == NULL) { + RETURN_FALSE; + } parser->isparsing = 1; - ret = XML_Parse(parser->parser, data, data_len, isFinal); + ret = XML_Parse(parser->parser, (XML_Char*)data, data_len, isFinal); parser->isparsing = 0; RETVAL_LONG(ret); } @@ -1469,28 +1421,31 @@ PHP_FUNCTION(xml_parse) PHP_FUNCTION(xml_parse_into_struct) { xml_parser *parser; - zval *pind, **xdata, **info = NULL; + zval *pind, *xdata, *info = NULL; char *data; - int data_len, ret; + size_t data_len; + int ret; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rsZ|Z", &pind, &data, &data_len, &xdata, &info) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "rsz/|z/", &pind, &data, &data_len, &xdata, &info) == FAILURE) { return; } - if (info) { - zval_dtor(*info); - array_init(*info); + if (info) { + zval_ptr_dtor(info); + array_init(info); } - ZEND_FETCH_RESOURCE(parser,xml_parser *, &pind, -1, "XML Parser", le_xml_parser); - - zval_dtor(*xdata); - array_init(*xdata); + if ((parser = (xml_parser *)zend_fetch_resource(Z_RES_P(pind), "XML Parser", le_xml_parser)) == NULL) { + RETURN_FALSE; + } - parser->data = *xdata; + zval_ptr_dtor(xdata); + array_init(xdata); + ZVAL_COPY_VALUE(&parser->data, xdata); + if (info) { - parser->info = *info; + ZVAL_COPY_VALUE(&parser->info, info); } parser->level = 0; @@ -1501,7 +1456,7 @@ PHP_FUNCTION(xml_parse_into_struct) XML_SetCharacterDataHandler(parser->parser, _xml_characterDataHandler); parser->isparsing = 1; - ret = XML_Parse(parser->parser, data, data_len, 1); + ret = XML_Parse(parser->parser, (XML_Char*)data, data_len, 1); parser->isparsing = 0; RETVAL_LONG(ret); @@ -1515,12 +1470,15 @@ PHP_FUNCTION(xml_get_error_code) xml_parser *parser; zval *pind; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &pind) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &pind) == FAILURE) { return; } - ZEND_FETCH_RESOURCE(parser,xml_parser *, &pind, -1, "XML Parser", le_xml_parser); - RETVAL_LONG((long)XML_GetErrorCode(parser->parser)); + if ((parser = (xml_parser *)zend_fetch_resource(Z_RES_P(pind), "XML Parser", le_xml_parser)) == NULL) { + RETURN_FALSE; + } + + RETURN_LONG((zend_long)XML_GetErrorCode(parser->parser)); } /* }}} */ @@ -1528,16 +1486,16 @@ PHP_FUNCTION(xml_get_error_code) Get XML parser error string */ PHP_FUNCTION(xml_error_string) { - long code; + zend_long code; char *str; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &code) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &code) == FAILURE) { return; } str = (char *)XML_ErrorString((int)code); if (str) { - RETVAL_STRING(str, 1); + RETVAL_STRING(str); } } /* }}} */ @@ -1549,10 +1507,13 @@ PHP_FUNCTION(xml_get_current_line_number) xml_parser *parser; zval *pind; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &pind) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &pind) == FAILURE) { return; } - ZEND_FETCH_RESOURCE(parser,xml_parser *, &pind, -1, "XML Parser", le_xml_parser); + + if ((parser = (xml_parser *)zend_fetch_resource(Z_RES_P(pind), "XML Parser", le_xml_parser)) == NULL) { + RETURN_FALSE; + } RETVAL_LONG(XML_GetCurrentLineNumber(parser->parser)); } @@ -1565,10 +1526,13 @@ PHP_FUNCTION(xml_get_current_column_number) xml_parser *parser; zval *pind; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &pind) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &pind) == FAILURE) { return; } - ZEND_FETCH_RESOURCE(parser,xml_parser *, &pind, -1, "XML Parser", le_xml_parser); + + if ((parser = (xml_parser *)zend_fetch_resource(Z_RES_P(pind), "XML Parser", le_xml_parser)) == NULL) { + RETURN_FALSE; + } RETVAL_LONG(XML_GetCurrentColumnNumber(parser->parser)); } @@ -1581,10 +1545,13 @@ PHP_FUNCTION(xml_get_current_byte_index) xml_parser *parser; zval *pind; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &pind) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &pind) == FAILURE) { return; } - ZEND_FETCH_RESOURCE(parser,xml_parser *, &pind, -1, "XML Parser", le_xml_parser); + + if ((parser = (xml_parser *)zend_fetch_resource(Z_RES_P(pind), "XML Parser", le_xml_parser)) == NULL) { + RETURN_FALSE; + } RETVAL_LONG(XML_GetCurrentByteIndex(parser->parser)); } @@ -1597,22 +1564,24 @@ PHP_FUNCTION(xml_parser_free) zval *pind; xml_parser *parser; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &pind) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &pind) == FAILURE) { return; } - ZEND_FETCH_RESOURCE(parser,xml_parser *, &pind, -1, "XML Parser", le_xml_parser); + if ((parser = (xml_parser *)zend_fetch_resource(Z_RES_P(pind), "XML Parser", le_xml_parser)) == NULL) { + RETURN_FALSE; + } if (parser->isparsing == 1) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Parser cannot be freed while it is parsing."); + php_error_docref(NULL, E_WARNING, "Parser cannot be freed while it is parsing."); RETURN_FALSE; } - if (zend_list_delete(parser->index) == FAILURE) { + if (zend_list_delete(Z_RES(parser->index)) == FAILURE) { RETURN_FALSE; } - RETVAL_TRUE; + RETURN_TRUE; } /* }}} */ @@ -1621,22 +1590,25 @@ PHP_FUNCTION(xml_parser_free) PHP_FUNCTION(xml_parser_set_option) { xml_parser *parser; - zval *pind, **val; - long opt; + zval *pind, *val; + zend_long opt; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rlZ", &pind, &opt, &val) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "rlz", &pind, &opt, &val) == FAILURE) { return; } - ZEND_FETCH_RESOURCE(parser,xml_parser *, &pind, -1, "XML Parser", le_xml_parser); + + if ((parser = (xml_parser *)zend_fetch_resource(Z_RES_P(pind), "XML Parser", le_xml_parser)) == NULL) { + RETURN_FALSE; + } switch (opt) { case PHP_XML_OPTION_CASE_FOLDING: convert_to_long_ex(val); - parser->case_folding = Z_LVAL_PP(val); + parser->case_folding = Z_LVAL_P(val); break; case PHP_XML_OPTION_SKIP_TAGSTART: convert_to_long_ex(val); - parser->toffset = Z_LVAL_PP(val); + parser->toffset = Z_LVAL_P(val); if (parser->toffset < 0) { php_error_docref(NULL TSRMLS_CC, E_NOTICE, "tagstart ignored"); parser->toffset = 0; @@ -1644,21 +1616,21 @@ PHP_FUNCTION(xml_parser_set_option) break; case PHP_XML_OPTION_SKIP_WHITE: convert_to_long_ex(val); - parser->skipwhite = Z_LVAL_PP(val); + parser->skipwhite = Z_LVAL_P(val); break; case PHP_XML_OPTION_TARGET_ENCODING: { xml_encoding *enc; convert_to_string_ex(val); - enc = xml_get_encoding(Z_STRVAL_PP(val)); + enc = xml_get_encoding((XML_Char*)Z_STRVAL_P(val)); if (enc == NULL) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unsupported target encoding \"%s\"", Z_STRVAL_PP(val)); + php_error_docref(NULL, E_WARNING, "Unsupported target encoding \"%s\"", Z_STRVAL_P(val)); RETURN_FALSE; } parser->target_encoding = enc->name; break; } default: - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown option"); + php_error_docref(NULL, E_WARNING, "Unknown option"); RETURN_FALSE; break; } @@ -1672,22 +1644,25 @@ PHP_FUNCTION(xml_parser_get_option) { xml_parser *parser; zval *pind; - long opt; + zend_long opt; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &pind, &opt) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "rl", &pind, &opt) == FAILURE) { return; } - ZEND_FETCH_RESOURCE(parser,xml_parser *, &pind, -1, "XML Parser", le_xml_parser); + + if ((parser = (xml_parser *)zend_fetch_resource(Z_RES_P(pind), "XML Parser", le_xml_parser)) == NULL) { + RETURN_FALSE; + } switch (opt) { case PHP_XML_OPTION_CASE_FOLDING: RETURN_LONG(parser->case_folding); break; case PHP_XML_OPTION_TARGET_ENCODING: - RETURN_STRING(parser->target_encoding, 1); + RETURN_STRING((char *)parser->target_encoding); break; default: - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown option"); + php_error_docref(NULL, E_WARNING, "Unknown option"); RETURN_FALSE; break; } @@ -1701,18 +1676,18 @@ PHP_FUNCTION(xml_parser_get_option) PHP_FUNCTION(utf8_encode) { char *arg; - XML_Char *encoded; - int arg_len, len; + size_t arg_len; + zend_string *encoded; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &arg, &arg_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &arg, &arg_len) == FAILURE) { return; } - encoded = xml_utf8_encode(arg, arg_len, &len, "ISO-8859-1"); + encoded = xml_utf8_encode(arg, arg_len, (XML_Char*)"ISO-8859-1"); if (encoded == NULL) { RETURN_FALSE; } - RETVAL_STRINGL(encoded, len, 0); + RETURN_STR(encoded); } /* }}} */ @@ -1721,18 +1696,18 @@ PHP_FUNCTION(utf8_encode) PHP_FUNCTION(utf8_decode) { char *arg; - XML_Char *decoded; - int arg_len, len; + size_t arg_len; + zend_string *decoded; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &arg, &arg_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &arg, &arg_len) == FAILURE) { return; } - decoded = xml_utf8_decode(arg, arg_len, &len, "ISO-8859-1"); + decoded = xml_utf8_decode((XML_Char*)arg, arg_len, (XML_Char*)"ISO-8859-1"); if (decoded == NULL) { RETURN_FALSE; } - RETVAL_STRINGL(decoded, len, 0); + RETURN_STR(decoded); } /* }}} */ |