Changeset 21 for trunk

Timestamp:

Sep 19, 2010, 6:07:06 PM (14 years ago)

Author:

djay

Message:

Small fix in the XML parser.

File:

• trunk/zoo-kernel/zoo_service_loader.c (modified) (3 diffs)

trunk/zoo-kernel/zoo_service_loader.c

@@ -752 +752 @@
 #endif
         xmlNodePtr cur2=cur->children;
-        while(cur2){
-          while(cur2->type!=XML_ELEMENT_NODE)
+        while(cur2!=NULL){
+          while(cur2!=NULL && cur2->type!=XML_ELEMENT_NODE)
             cur2=cur2->next;
+          if(cur2==NULL)
+            break;
+          
           /**
            * Indentifier
@@ -1011 +1014 @@
 #endif
             xmlNodePtr cur4=cur2->children;
-            while(cur4){
-              while(cur4->type!=XML_ELEMENT_NODE)
+            while(cur4!=NULL){
+              while(cur4!=NULL && cur4->type!=XML_ELEMENT_NODE)
                 cur4=cur4->next;
+
+              if(cur4==NULL){
+                break;
+              }
 
               if(xmlStrcasecmp(cur4->name, BAD_CAST "LiteralData")==0){
@@ -1090 +1097 @@
         dumpMaps(request_input_real_format);
 #endif
-        tmpmaps=tmpmaps->next;
-              
+        freeMaps(&tmpmaps);
+        free(tmpmaps);
+        tmpmaps=NULL;
       }
-#ifdef DEBUG
-      dumpMaps(tmpmaps); 
-#endif
     }
 #ifdef DEBUG