Some leaks still present in xml parsing library.

Samo Penic

2016-02-29 bb40336eb8a2acc9f2e3d2e9059b7d90afe5c0c4

 src/restore.c

@@ -12,6 +12,7 @@
#include "triangle.h"
#include "bond.h"
#include "energy.h"
#include "poly.h"
#include "initial_distribution.h"

ts_bool parseDump(char *dumpfname) {
@@ -50,12 +51,12 @@
                  if ((!xmlStrcmp(cur2->name, (const xmlChar *)"Points"))){
                     fprintf(stderr,"Found point data\n");
                     if(vesicle!=NULL)
                        parseXMLVertexPosition(vesicle, doc, cur);
                        parseXMLVertexPosition(vesicle, doc, cur2);
                  }
                  if ((!xmlStrcmp(cur2->name, (const xmlChar *)"Cells"))){
                  fprintf(stderr,"Found cell(Bonds) data\n");
                     if(vesicle!=NULL)
                        parseXMLBonds(vesicle, doc, cur);
                        parseXMLBonds(vesicle, doc, cur2);
                  }
                  cur2=cur2->next;
               }   
@@ -68,12 +69,16 @@
   }
   
   xmlFreeDoc(doc);

   vesicle->poly_list=init_poly_list(0, 0, vesicle->vlist, vesicle);

   init_normal_vectors(vesicle->tlist);
   mean_curvature_and_energy(vesicle);

/* TODO: cells, polymeres, filaments, core, tape */

   fprintf(stderr,"Restoration completed\n");
//   write_vertex_xml_file(vesicle,999);
   vesicle_free(vesicle);
   exit(0);
   return TS_SUCCESS;
@@ -272,43 +277,51 @@
         points = xmlNodeListGetString(doc, child->xmlChildrenNode, 1);
         pts=(char *)points;
         token[0]=strtok(pts," ");
         for(i=1;i<3;i++)   token[i]=strtok(NULL," ");
         token[1]=strtok(NULL," ");
         token[2]=strtok(NULL,"\n");
         idx=0;
         while(token[0]!=NULL){
            vesicle->vlist->vtx[idx]->x=atof(token[0]);
            vesicle->vlist->vtx[idx]->y=atof(token[1]);
            vesicle->vlist->vtx[idx]->z=atof(token[2]);
            for(i=0;i<3;i++)   token[i]=strtok(NULL," ");	
            for(i=0;i<2;i++)   token[i]=strtok(NULL," ");	
            token[2]=strtok(NULL,"\n");
            idx++;
         }
         xmlFree(points);
      }
      child=child->next;
   }
   fprintf(stderr,"Vertices position j=%d\n",idx);	

   return TS_SUCCESS;
}
ts_bool parseXMLBonds(ts_vesicle *vesicle,xmlDocPtr doc, xmlNodePtr cur){
   xmlNodePtr child = cur->xmlChildrenNode;
   xmlChar *bonds;
   xmlChar *bonds, *conname;
   char *b;
   int i, idx;
   int idx;
   char *token[2];
   while (child != NULL) {
      if ((!xmlStrcmp(child->name, (const xmlChar *)"DataArray"))){
      conname=xmlGetProp(child, (xmlChar *)"Name");
      if ((!xmlStrcmp(child->name, (const xmlChar *)"DataArray")) && !xmlStrcmp(conname, (const xmlChar *)"connectivity") ){
         bonds = xmlNodeListGetString(doc, child->xmlChildrenNode, 1);
         b=(char *)bonds;
         token[0]=strtok(b," ");
         token[1]=strtok(NULL," ");
         token[1]=strtok(NULL,"\n");
         idx=0;
         while(token[0]!=NULL){
            bond_add(vesicle->blist, vesicle->vlist->vtx[atoi(token[0])], vesicle->vlist->vtx[atoi(token[1])]);
            for(i=0;i<2;i++)   token[i]=strtok(NULL," ");	
            token[0]=strtok(NULL," ");	
            token[1]=strtok(NULL,"\n");	
            idx++;
         }
         xmlFree(bonds);
      }
      xmlFree(conname);
      child=child->next;
   }
   fprintf(stderr,"Bond data j=%d\n",idx);	
   return TS_SUCCESS;
}