Fixed some possible issues with the XML implementation, regarding UTF-8

Do proper conversion from char * to xmlChar *.  Need to figure out a
better way how to return xmlChar * to char * when returning strings
which may contain UTF-8.

1 files changed, 17 insertions, 2 deletions

diff --git a/common/eurephia_xml.c b/common/eurephia_xml.c
index 7e6baf8..fe09bde 100644
--- a/common/eurephia_xml.c
+++ b/common/eurephia_xml.c
@@ -30,26 +30,40 @@
 
 char *xmlGetAttrValue(xmlAttr *attr, const char *key) {
         xmlAttr *aptr;
+        xmlChar *x_key = NULL;
+
+        x_key = xmlCharStrdup(key);
+        assert( x_key != NULL );
 
         for( aptr = attr; aptr != NULL; aptr = aptr->next ) {
-                if( xmlStrcmp(aptr->name, (xmlChar *)key) == 0 ) {
+                if( xmlStrcmp(aptr->name, x_key) == 0 ) {
+                        // FIXME: Should find a better way to return UTF-8 data
+                        free_nullsafe(x_key);
                         return (char *)(aptr->children != NULL ? aptr->children->content : NULL);
                 }
         }
+        free_nullsafe(x_key);
         return NULL;
 }
 
 xmlNode *xmlFindNode(xmlNode *node, const char *key) {
         xmlNode *nptr = NULL;
+        xmlChar *x_key = NULL;
 
         if( node->children == NULL ) {
                 return NULL;
         }
+
+        x_key = xmlCharStrdup(key);
+        assert( x_key != NULL );
+
         for( nptr = node->children; nptr != NULL; nptr = nptr->next ) {
-                if( xmlStrcmp(nptr->name, (xmlChar *)key) == 0 ) {
+                if( xmlStrcmp(nptr->name, x_key) == 0 ) {
+                        free_nullsafe(x_key);
                         return nptr;
                 }
         }
+        free_nullsafe(x_key);
         return NULL;
 }
 
@@ -103,6 +117,7 @@ xmlNode *eurephiaXML_getRoot(eurephiaCTX *ctx, xmlDoc *doc, const char *nodeset,
 
 
 inline char *xmlExtractContent(xmlNode *n) {
+        // FIXME: Should find better way how to return UTF-8 data
         return (char *) (((n != NULL) && (n->children != NULL)) ? n->children->content : NULL);
 }