Changeset 850 for branches/prototype-v0/zoo-project/zoo-kernel/response_print.c

Timestamp:

Aug 29, 2017, 10:52:39 AM (7 years ago)

Author:

djay

Message:

Fix various memory leaks and enhance the callback support. Add the prohibited keyword to the callback section to avoid calling callback for such services.

File:

• branches/prototype-v0/zoo-project/zoo-kernel/response_print.c (modified) (9 diffs)

branches/prototype-v0/zoo-project/zoo-kernel/response_print.c

@@ -339 +339 @@
       }
       else{
-        nc4 = xmlNewNode(ns_ows, BAD_CAST "Language");
-        xmlAddChild(nc4,xmlNewText(BAD_CAST buff));
         if(dcount==0){
           if(vid==0){
+            nc4 = xmlNewNode(ns_ows, BAD_CAST "Language");
+            xmlAddChild(nc4,xmlNewText(BAD_CAST buff));
             xmlAddChild(nc2,nc4);
             xmlAddChild(nc1,nc2);
@@ -867 +867 @@
         }
       }else{
-        xmlNodePtr nc2 = xmlNewNode(ns_ows, BAD_CAST "AdditionalParameter");
-        xmlNodePtr nc3 = xmlNewNode(ns_ows, BAD_CAST "Name");
-        xmlAddChild(nc3,xmlNewText(BAD_CAST meta->name));
-        xmlAddChild(nc2,nc3);
-        if(fromDb<0){
-          char *mptr;
-          char* meta_values=strtok_r(meta->value,",",&mptr);
-          while(meta_values!=NULL){
+        if(strncasecmp(meta->name,"length",6)!=0 && strncasecmp(meta->name,"fromDb",6)!=0){
+          xmlNodePtr nc2 = xmlNewNode(ns_ows, BAD_CAST "AdditionalParameter");
+          xmlNodePtr nc3 = xmlNewNode(ns_ows, BAD_CAST "Name");
+          xmlAddChild(nc3,xmlNewText(BAD_CAST meta->name));
+          xmlAddChild(nc2,nc3);
+          if(fromDb<0){
+            char *mptr;
+            char* meta_values=strtok_r(meta->value,",",&mptr);
+            while(meta_values!=NULL){
+              xmlNodePtr nc4 = xmlNewNode(ns_ows, BAD_CAST "Value");
+              xmlAddChild(nc4,xmlNewText(BAD_CAST meta_values));
+              xmlAddChild(nc2,nc4);
+              meta_values=strtok_r(NULL,",",&mptr);
+            }
+          }else{
             xmlNodePtr nc4 = xmlNewNode(ns_ows, BAD_CAST "Value");
-            xmlAddChild(nc4,xmlNewText(BAD_CAST meta_values));
+            xmlAddChild(nc4,xmlNewCDataBlock(doc,BAD_CAST meta->value,strlen(meta->value)));
             xmlAddChild(nc2,nc4);
-            meta_values=strtok_r(NULL,",",&mptr);
-          }
-        }else{
-          xmlNodePtr nc4 = xmlNewNode(ns_ows, BAD_CAST "Value");
-          xmlAddChild(nc4,xmlNewCDataBlock(doc,BAD_CAST meta->value,strlen(meta->value)));
-          xmlAddChild(nc2,nc4);
-        }
-        xmlAddChild(nc1,nc2);
+          }
+          xmlAddChild(nc1,nc2);
+        }
         hasTitle=-1;
       }
@@ -892 +894 @@
         xmlAddChild(nc,nc1);
         hasValue=1;
-      }
+      }else
+        free(ctitle);
     }
     if(oMeta!=NULL && hasValue<0 && nc1!=NULL){
@@ -1404 +1407 @@
                 }
                 else
-                  xmlFree(nc9);
+                  xmlFreeNode(nc9);
                 if(strcasecmp(tmp1->name,"uom")==0)
                   hasUOM1=true;
@@ -1601 +1604 @@
                   xmlAddChild(nc5,nc6);
                 else
-                  xmlFree(nc6);
+                  xmlFreeNode(nc6);
               }
               else
-                xmlFree(nc6);
+                xmlFreeNode(nc6);
             }
             tmp1=tmp1->next;
@@ -1631 +1634 @@
             }
             else{
+              xmlFreeNode(nc4);
               xmlAddChild(nc3,nc5);
             }
           }
           else
-            if(datatype!=1)
+            if(datatype!=1){
+              xmlFreeNode(nc4);
               xmlAddChild(nc3,nc5);
+            }
 
         _tmp=_tmp->next;
@@ -1654 +1660 @@
         }
         else{
+          xmlFreeNode(nc4);
           xmlAddChild(nc3,nc5);
         }
@@ -1673 +1680 @@
     }
     if(e->child!=NULL && vid==0){
+      xmlFreeNode(nc3);
       elements* children=dupElements(e->child);
       elements* cursor=children;
@@ -1678 +1686 @@
         char* tmp=strdup(cursor->name);
         free(cursor->name);
-        cursor->name=(char*)malloc((strlen(cursor->name)+strlen(e->name)+2)*sizeof(char));
+        cursor->name=(char*)malloc((strlen(tmp)+strlen(e->name)+2)*sizeof(char));
         sprintf(cursor->name,"%s.%s",e->name,tmp);
         cursor=cursor->next;