From 8c41df548078425bce27cd833516e3a7392fe1c3 Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Tue, 14 Jun 2016 21:29:02 +0800 Subject: Unused var --- ext/xml/xml.c | 1 - 1 file changed, 1 deletion(-) (limited to 'ext/xml/xml.c') diff --git a/ext/xml/xml.c b/ext/xml/xml.c index 9a23044641..fe29f2891d 100644 --- a/ext/xml/xml.c +++ b/ext/xml/xml.c @@ -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; -- cgit v1.2.1 From adc95c511495f00cd1a90feff5fff7968e38fc4a Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Thu, 23 Jun 2016 12:47:06 +0300 Subject: Fixed compilation warnings --- ext/xml/xml.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ext/xml/xml.c') diff --git a/ext/xml/xml.c b/ext/xml/xml.c index fe29f2891d..bf497b2d7c 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; -- cgit v1.2.1 From 0ac51448368162efb62c188acb98924f8b05c3e9 Mon Sep 17 00:00:00 2001 From: Stanislav Malyshev Date: Tue, 28 Jun 2016 01:22:55 -0700 Subject: Fix bug #72099: xml_parse_into_struct segmentation fault --- ext/xml/xml.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/xml/xml.c') diff --git a/ext/xml/xml.c b/ext/xml/xml.c index bf497b2d7c..72f629ba2c 100644 --- a/ext/xml/xml.c +++ b/ext/xml/xml.c @@ -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); -- cgit v1.2.1