Changeset 498 for trunk/zoo-project/zoo-kernel

Timestamp:

Aug 13, 2014, 7:42:16 PM (10 years ago)

Author:

djay

Message:

Avoid issue ​repported on the mailing list.

File:

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

trunk/zoo-project/zoo-kernel/zoo_service_loader.c

@@ -1840 +1840 @@
                   int buffersize;
                   xmlNodePtr cur5=cur4->children;
-                  while(cur5!=NULL &&cur5->type!=XML_ELEMENT_NODE && cur5->type!=XML_CDATA_SECTION_NODE)
+                  while(cur5!=NULL && cur5->type!=XML_ELEMENT_NODE && cur5->type!=XML_CDATA_SECTION_NODE)
                     cur5=cur5->next;
-                  if(cur5->type!=XML_CDATA_SECTION_NODE){
+                  if(cur5!=NULL && cur5->type!=XML_CDATA_SECTION_NODE){
                     xmlDocSetRootElement(doc1,cur5);
                     xmlDocDumpFormatMemoryEnc(doc1, &mv, &buffersize, "utf-8", 1);
@@ -1851 +1851 @@
                   }
                 }
-                addToMap(tmpmaps->content,"value",(char*)mv);
-                xmlFree(mv);
+                if(mv!=NULL){
+                  addToMap(tmpmaps->content,"value",(char*)mv);
+                  xmlFree(mv);
+                }
               }else{
                 xmlChar* tmp=xmlNodeListGetRawString(doc,cur4->xmlChildrenNode,0);