MFH(r-1.117): fixed segfault in xml_parser_create()

diff --git a/ext/xml/xml.c b/ext/xml/xml.c
index b40bc1743f1a0bc69c13adba846a105d2e7eab16..38f5cf0d6884c0d1ba5cbacee056eee0b09bfa1d 100644 (file)
--- a/ext/xml/xml.c
+++ b/ext/xml/xml.c
@@ -1032,7 +1032,7 @@ PHP_FUNCTION(xml_parser_create)
                                                Z_STRLEN_PP(encodingArg)) == 0) {
                        encoding = "US-ASCII";
                } else { /* UTF-16 not supported */
-                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s: unsupported source encoding \"%s\"", Z_STRVAL_PP(encodingArg));
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "unsupported source encoding \"%s\"", Z_STRVAL_PP(encodingArg));
                        RETURN_FALSE;
                }
        } else {
@@ -1081,7 +1081,7 @@ PHP_FUNCTION(xml_parser_create_ns)
                                                Z_STRLEN_PP(encodingArg)) == 0) {
                        encoding = "US-ASCII";
                } else { /* UTF-16 not supported */
-                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s: unsupported source encoding \"%s\"", Z_STRVAL_PP(encodingArg));
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "unsupported source encoding \"%s\"", Z_STRVAL_PP(encodingArg));
                        RETURN_FALSE;
                }
        } else {
@@ -1136,9 +1136,9 @@ PHP_FUNCTION(xml_set_object)
        parser->object = *mythis;
 
        /* please leave this commented - or ask thies@thieso.net before doing it (again) */
-#ifdef ZEND_ENGINE_2
+/* #ifdef ZEND_ENGINE_2
        zval_add_ref(&parser->object); 
-#endif
+#endif */
 
        RETVAL_TRUE;
 }