sterling                Fri Jul  4 18:21:23 2003 EDT

  Modified files:              
    /php-src/ext/simplexml      simplexml.c 
  Log:
  "real" fix
  
  
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.48 php-src/ext/simplexml/simplexml.c:1.49
--- php-src/ext/simplexml/simplexml.c:1.48      Fri Jul  4 17:58:09 2003
+++ php-src/ext/simplexml/simplexml.c   Fri Jul  4 18:21:23 2003
@@ -16,7 +16,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: simplexml.c,v 1.48 2003/07/04 21:58:09 sterling Exp $ */
+/* $Id: simplexml.c,v 1.49 2003/07/04 22:21:23 sterling Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -719,10 +719,7 @@
 cast_object(zval *object, int type, char *contents TSRMLS_DC)
 {
        if (contents) {
-               int len = strlen(contents);
-               ZVAL_STRINGL(object, contents, len, 1);
-       } else {
-               ZVAL_NULL(object);
+               ZVAL_STRINGL(object, contents, strlen(contents), 1);
        }
 
        switch (type) {
@@ -751,7 +748,6 @@
        char           *contents = NULL;
 
     sxe = php_sxe_fetch_object(readobj TSRMLS_CC);
-       
        if (should_free) {
                zval_dtor(writeobj);
        }
@@ -1059,7 +1055,7 @@
 {
        php_info_print_table_start();
        php_info_print_table_header(2, "Simplexml support", "enabled");
-       php_info_print_table_row(2, "Revision", "$Revision: 1.48 $");
+       php_info_print_table_row(2, "Revision", "$Revision: 1.49 $");
        php_info_print_table_end();
 
 }



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to