[PHP-CVS] cvs: php-src(PHP_5_0) /ext/xmlrpc/libxmlrpc xml_element.c

[Joe Orton]

jorton          Fri Apr 22 07:54:18 2005 EDT

  Modified files:              (Branch: PHP_5_0)
    /php-src/ext/xmlrpc/libxmlrpc       xml_element.c 
  Log:
  MFH: Fixed bug #32797 (invalid C code in xmlrpc extension).
  
  
http://cvs.php.net/diff.php/php-src/ext/xmlrpc/libxmlrpc/xml_element.c?r1=1.6&r2=1.6.2.1&ty=u
Index: php-src/ext/xmlrpc/libxmlrpc/xml_element.c
diff -u php-src/ext/xmlrpc/libxmlrpc/xml_element.c:1.6 
php-src/ext/xmlrpc/libxmlrpc/xml_element.c:1.6.2.1
--- php-src/ext/xmlrpc/libxmlrpc/xml_element.c:1.6      Tue Jun  1 16:16:06 2004
+++ php-src/ext/xmlrpc/libxmlrpc/xml_element.c  Fri Apr 22 07:54:17 2005
@@ -31,7 +31,7 @@
 */
 
 
-static const char rcsid[] = "#(@) $Id: xml_element.c,v 1.6 2004/06/01 20:16:06 
iliaa Exp $";
+static const char rcsid[] = "#(@) $Id: xml_element.c,v 1.6.2.1 2005/04/22 
11:54:17 jorton Exp $";
 
 
 
@@ -44,6 +44,9 @@
  *   06/2000
  * HISTORY
  *   $Log: xml_element.c,v $
+ *   Revision 1.6.2.1  2005/04/22 11:54:17  jorton
+ *   MFH: Fixed bug #32797 (invalid C code in xmlrpc extension).
+ *
  *   Revision 1.6  2004/06/01 20:16:06  iliaa
  *   Fixed bug #28597 (xmlrpc_encode_request() incorrectly encodes chars in
  *   200-210 range).
@@ -113,7 +116,7 @@
 #include "expat.h"
 #include "encodings.h"
 
-#define my_free(thing)  if(thing) {free(thing); thing = 0;}
+#define my_free(thing)  if(thing) {free(thing); thing = NULL;}
 
 #define XML_DECL_START                 "<?xml"
 #define XML_DECL_START_LEN             sizeof(XML_DECL_START) - 1
@@ -189,7 +192,10 @@
 
       Q_Destroy(&root->children);
       Q_Destroy(&root->attrs);
-      my_free((char*)root->name);
+      if(root->name) {
+          free((char *)root->name);
+          root->name = NULL;
+      }
       simplestring_free(&root->text);
       my_free(root);
    }

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