cvs: php4 /ext/xml xml.c

moriyoshi Wed Apr 2 20:00:46 2003 EDT Modified files: /php4/ext/xml xml.c Log: Fixed segfault in xml_parser_create() # due to too many %s in printf spec Index: php4/ext/xml/xml.c diff -u php4/ext/xml/xml.c:1.116 php4/ext/xml/xml.c:1.117 --- php4/ext/xml/xml.c:1.116 Fri Mar 21 00:26:56 2003 +++ php4/ext/xml/xml.c Wed Apr 2 20:00:45 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: xml.c,v 1.116 2003/03/21 05:26:56 sterling Exp $ */ +/* $Id: xml.c,v 1.117 2003/04/03 01:00:45 moriyoshi Exp $ */ #define IS_EXT_MODULE @@ -1027,7 +1027,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 { @@ -1076,7 +1076,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 { @@ -1131,9 +1131,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; }