Changeset 63 for trunk/zoo-kernel/zoo_service_loader.c

Timestamp:

Jan 8, 2011, 1:01:25 AM (13 years ago)

Author:

djay

Message:

Remove memory leaks. Add support for minOccurs and maxOccurs informations in the inputs maps to close ticket #12.

File:

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

trunk/zoo-kernel/zoo_service_loader.c

@@ -27 +27 @@
 extern "C" int yylex();
 extern "C" int crlex();
-
 
 extern "C" {
@@ -472 +471 @@
     SERVICE_URL=strdup(tmpm->value);
   else
-    SERVICE_URL=DEFAULT_SERVICE_URL;
+    SERVICE_URL=strdup(DEFAULT_SERVICE_URL);
 
   service* s[100];
@@ -1614 +1613 @@
    * DataInputs and ResponseDocument / RawDataOutput
    */  
-  char *dfv=addDefaultValues(&request_input_real_format,s1->inputs,m,"inputs");
+  char *dfv=addDefaultValues(&request_input_real_format,s1->inputs,m,0);
   if(strcmp(dfv,"")!=0){
     char tmps[1024];
@@ -1621 +1620 @@
     addToMap(tmpe,"code","MissingParameterValue");
     printExceptionReportResponse(m,tmpe);
+    freeService(&s1);
+    free(s1);
     freeMap(&tmpe);
     free(tmpe);
@@ -1626 +1627 @@
     free(m);
     free(REQUEST);
+    free(SERVICE_URL);
     freeMaps(&request_input_real_format);
     free(request_input_real_format);
@@ -1634 +1636 @@
     return 1;
   }
-  addDefaultValues(&request_output_real_format,s1->outputs,m,"outputs");
+  addDefaultValues(&request_output_real_format,s1->outputs,m,1);
 
 #ifdef DEBUG