rrichards Mon Jul 24 17:42:25 2006 UTC
Modified files:
/php-src/ext/xmlreader php_xmlreader.c
Log:
fix segfault
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlreader/php_xmlreader.c?r1=1.37&r2=1.38&diff_format=u
Index: php-src/ext/xmlreader/php_xmlreader.c
diff -u php-src/ext/xmlreader/php_xmlreader.c:1.37
php-src/ext/xmlreader/php_xmlreader.c:1.38
--- php-src/ext/xmlreader/php_xmlreader.c:1.37 Sat Jul 22 17:40:08 2006
+++ php-src/ext/xmlreader/php_xmlreader.c Mon Jul 24 17:42:25 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_xmlreader.c,v 1.37 2006/07/22 17:40:08 andrei Exp $ */
+/* $Id: php_xmlreader.c,v 1.38 2006/07/24 17:42:25 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -425,7 +425,7 @@
char *name;
UConverter *orig_runtime_conv;
- orig_runtime_conv = ZEND_U_CONVERTER(UG(runtime_encoding_conv));
+ orig_runtime_conv = UG(runtime_encoding_conv);
UG(runtime_encoding_conv) = UG(utf8_conv);
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &name,
&name_len) == FAILURE) {
@@ -632,7 +632,7 @@
char *name, *ns_uri;
UConverter *orig_runtime_conv;
- orig_runtime_conv = ZEND_U_CONVERTER(UG(runtime_encoding_conv));
+ orig_runtime_conv = UG(runtime_encoding_conv);
UG(runtime_encoding_conv) = UG(utf8_conv);
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &name,
&name_len, &ns_uri, &ns_uri_len) == FAILURE) {
@@ -718,7 +718,7 @@
char *name;
UConverter *orig_runtime_conv;
- orig_runtime_conv = ZEND_U_CONVERTER(UG(runtime_encoding_conv));
+ orig_runtime_conv = UG(runtime_encoding_conv);
UG(runtime_encoding_conv) = UG(utf8_conv);
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &name,
&name_len) == FAILURE) {
@@ -785,7 +785,7 @@
char *name, *ns_uri;
UConverter *orig_runtime_conv;
- orig_runtime_conv = ZEND_U_CONVERTER(UG(runtime_encoding_conv));
+ orig_runtime_conv = UG(runtime_encoding_conv);
UG(runtime_encoding_conv) = UG(utf8_conv);
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &name,
&name_len, &ns_uri, &ns_uri_len) == FAILURE) {
@@ -873,7 +873,7 @@
char *name = NULL;
UConverter *orig_runtime_conv;
- orig_runtime_conv = ZEND_U_CONVERTER(UG(runtime_encoding_conv));
+ orig_runtime_conv = UG(runtime_encoding_conv);
UG(runtime_encoding_conv) = UG(utf8_conv);
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &name,
&name_len) == FAILURE) {
@@ -926,7 +926,7 @@
xmlTextReaderPtr reader = NULL;
UConverter *orig_runtime_conv;
- orig_runtime_conv = ZEND_U_CONVERTER(UG(runtime_encoding_conv));
+ orig_runtime_conv = UG(runtime_encoding_conv);
UG(runtime_encoding_conv) = UG(utf8_conv);
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "t|s!l", &source,
&source_len, &source_type, &encoding, &encoding_len, &options) == FAILURE) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
