Fixed bug #32001 (xml_parse_into_struct() exceeds maximum execution time)

diff --git a/ext/xml/compat.c b/ext/xml/compat.c
index b51d0e8a4a5f216d3f10bbef484376a2ae1fe6cb..cac165094fcdc6ef8bea62c333ef0b36dfb22ee6 100644 (file)
--- a/ext/xml/compat.c
+++ b/ext/xml/compat.c
@@ -379,8 +379,12 @@ XML_ParserCreate_MM(const XML_Char *encoding, const XML_Memory_Handling_Suite *m
        }
        if (encoding != NULL) {
                parser->parser->encoding = xmlStrdup(encoding);
+#if LIBXML_VERSION <= 20617
+       /* for older versions of libxml2, allow correct detection of
+        * charset in documents with a BOM: */
        } else {
                parser->parser->charset = XML_CHAR_ENCODING_NONE;
+#endif
        }
        parser->parser->replaceEntities = 1;
        parser->parser->wellFormed = 0;
@@ -478,6 +482,33 @@ XML_Parse(XML_Parser parser, const XML_Char *data, int data_len, int is_final)
 {
 #if LIBXML_VERSION >= 20600
        int error;
+#endif
+
+/* The following is a hack to keep BC with PHP 4 while avoiding 
+the inifite loop in libxml <= 2.6.17 which occurs when no encoding 
+has been defined and none can be detected */
+#if LIBXML_VERSION <= 20617
+       if (parser->parser->charset == XML_CHAR_ENCODING_NONE) {
+               if (data_len >= 4 || (parser->parser->input->buf->buffer->use + data_len >= 4)) {
+                       xmlChar start[4];
+                       int char_count;
+
+                       char_count = parser->parser->input->buf->buffer->use;
+                       if (char_count > 4) {
+                               char_count = 4;
+                       }
+
+                       memcpy(start, parser->parser->input->buf->buffer->content, (size_t)char_count);
+                       memcpy(start + char_count, data, (size_t)(4 - char_count));
+
+                       if (xmlDetectCharEncoding(&start[0], 4) == XML_CHAR_ENCODING_NONE) {
+                               parser->parser->charset = XML_CHAR_ENCODING_UTF8;
+                       }
+               }
+       }
+#endif
+
+#if LIBXML_VERSION >= 20600
        error = xmlParseChunk(parser->parser, data, data_len, is_final);
        if (!error) {
                return 1;