diff options
| author | Aaron Piotrowski <aaron@trowski.com> | 2016-07-03 22:42:10 -0500 |
|---|---|---|
| committer | Aaron Piotrowski <aaron@trowski.com> | 2016-07-03 22:42:10 -0500 |
| commit | d9a9cf8ecaef891b2369969e9efe9f6261359158 (patch) | |
| tree | 04bcc83b3c9be1924007e007e1f508f7229af7ab /ext/xml/xml.c | |
| parent | 583386d59e6b362fe49e51594718a109d0c0cc2f (diff) | |
| parent | c2b29a58bc0916e248ba2584564558097b16b51f (diff) | |
| download | php-git-d9a9cf8ecaef891b2369969e9efe9f6261359158.tar.gz | |
Merge branch 'master' into iterable
Diffstat (limited to 'ext/xml/xml.c')
| -rw-r--r-- | ext/xml/xml.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/ext/xml/xml.c b/ext/xml/xml.c index 9a23044641..72f629ba2c 100644 --- a/ext/xml/xml.c +++ b/ext/xml/xml.c @@ -638,7 +638,7 @@ PHP_XML_API zend_string *xml_utf8_decode(const XML_Char *s, size_t len, const XM c = '?'; } - ZSTR_VAL(str)[ZSTR_LEN(str)++] = decoder ? decoder(c) : c; + ZSTR_VAL(str)[ZSTR_LEN(str)++] = decoder ? (unsigned int)decoder(c) : c; } ZSTR_VAL(str)[ZSTR_LEN(str)] = '\0'; if (ZSTR_LEN(str) < len) { @@ -864,7 +864,7 @@ void _xml_characterDataHandler(void *userData, const XML_Char *s, int len) } if (!Z_ISUNDEF(parser->data)) { - int i; + size_t i; int doprint = 0; zend_string *decoded_value; @@ -918,7 +918,7 @@ void _xml_characterDataHandler(void *userData, const XML_Char *s, int len) break; } ZEND_HASH_FOREACH_END(); - if (parser->level <= XML_MAXLEVEL) { + if (parser->level <= XML_MAXLEVEL && parser->level > 0) { array_init(&tag); _xml_add_to_info(parser,parser->ltags[parser->level-1] + parser->toffset); @@ -1554,7 +1554,6 @@ PHP_FUNCTION(xml_parser_free) { zval *pind; xml_parser *parser; - zend_resource *res; if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &pind) == FAILURE) { return; |