rrichards Wed Mar 2 13:14:01 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/xml compat.c
Log:
MFH: Fixed bug #32001 (xml_parse_into_struct() exceeds maximum execution time)
http://cvs.php.net/diff.php/php-src/ext/xml/compat.c?r1=1.32.2.7&r2=1.32.2.8&ty=u
Index: php-src/ext/xml/compat.c
diff -u php-src/ext/xml/compat.c:1.32.2.7 php-src/ext/xml/compat.c:1.32.2.8
--- php-src/ext/xml/compat.c:1.32.2.7 Fri Dec 17 07:21:34 2004
+++ php-src/ext/xml/compat.c Wed Mar 2 13:14:01 2005
@@ -379,8 +379,12 @@
}
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 @@
{
#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;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
