cvs: php4(PHP_4_3) /ext/xml xml.c

moriyoshi Wed Apr 2 20:01:09 2003 EDT Modified files: (Branch: PHP_4_3) /php4/ext/xml xml.c Log: MFH(r-1.117): fixed segfault in xml_parser_create() Index: php4/ext/xml/xml.c diff -u php4/ext/xml/xml.c:1.110.2.2 php4/ext/xml/xml.c:1.110.2.3 --- php4/ext/xml/xml.c:1.110.2.2 Tue Dec 31 11:35:43 2002 +++ php4/ext/xml/xml.c Wed Apr 2 20:01:09 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: xml.c,v 1.110.2.2 2002/12/31 16:35:43 sebastian Exp $ */ +/* $Id: xml.c,v 1.110.2.3 2003/04/03 01:01:09 moriyoshi Exp $ */ #define IS_EXT_MODULE @@ -1032,7 +1032,7 @@ 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 @@ 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 @@ 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; }