summaryrefslogtreecommitdiff
path: root/ext/xmlrpc/libxmlrpc/xml_element.c
diff options
context:
space:
mode:
authorJoe Orton <jorton@php.net>2005-04-22 11:54:17 +0000
committerJoe Orton <jorton@php.net>2005-04-22 11:54:17 +0000
commit5fa11c0579d177ce9c05e8ca74aaa16c429b75d8 (patch)
tree92147356c810ef6f6a8624895565d8812a3da9bd /ext/xmlrpc/libxmlrpc/xml_element.c
parent332f700522555c28e7edef0795e673e16dea2d0e (diff)
downloadphp-git-5fa11c0579d177ce9c05e8ca74aaa16c429b75d8.tar.gz
MFH: Fixed bug #32797 (invalid C code in xmlrpc extension).
Diffstat (limited to 'ext/xmlrpc/libxmlrpc/xml_element.c')
-rw-r--r--ext/xmlrpc/libxmlrpc/xml_element.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/ext/xmlrpc/libxmlrpc/xml_element.c b/ext/xmlrpc/libxmlrpc/xml_element.c
index 5fee23959c..e3906bb0e7 100644
--- a/ext/xmlrpc/libxmlrpc/xml_element.c
+++ b/ext/xmlrpc/libxmlrpc/xml_element.c
@@ -44,6 +44,11 @@ static const char rcsid[] = "#(@) $Id$";
* 06/2000
* HISTORY
* $Log$
+ * Revision 1.6 2004/06/01 20:16:06 iliaa
+ * Fixed bug #28597 (xmlrpc_encode_request() incorrectly encodes chars in
+ * 200-210 range).
+ * Patch by: fernando dot nemec at folha dot com dot br
+ *
* Revision 1.5 2003/12/16 21:00:21 sniper
* Fix some compile warnings (patch by Joe Orton)
*
@@ -108,7 +113,7 @@ static const char rcsid[] = "#(@) $Id$";
#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
@@ -184,7 +189,10 @@ void xml_elem_free_non_recurse(xml_element* root) {
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);
}