Changeset 805 for trunk

Timestamp:

Jan 22, 2017, 5:32:02 PM (8 years ago)

Author:

djay

Message:

Return default iotype if no value has been provided. Fix potential segfault in case tmpIoType is null.

Location:

trunk/zoo-project/zoo-kernel

Files:

• configure.ac (modified) (1 diff)
• server_internal.c (modified) (1 diff)
• service.c (modified) (2 diffs)

trunk/zoo-project/zoo-kernel/configure.ac

@@ -824 +824 @@
                 OTB_RPATH="$OTBPATH/include/OTB-${OTBVERS}/"
                 OTB_CPPFLAGS="-I${OTB_RPATH}ApplicationEngine -I$OTB_RPATH/Common -I$ITKPATH/include/ITK-$ITKVERS -I$OTB_RPATH/Utilities/ITK -I$OTB_RPATH/ -I$OTB_RPATH/IO -I$OTB_RPATH/UtilitiesAdapters/OssimAdapters -I$OTB_RPATH/UtilitiesAdapters/CurlAdapters -I$OTB_RPATH/Utilities/BGL -I$OTB_RPATH/UtilitiesAdapters/ITKPendingPatches -I$OTB_RPATH/Utilities/otbconfigfile $GDAL_CFLAGS"
-                OTB_LDFLAGS="-L/usr/lib/x86_64-linux-gnu/ -lOTBImageIO-$OTBVERS -lOTBCommon-$OTBVERS -lOTBApplicationEngine-$OTBVERS -L$ITKPATH/lib -lITKBiasCorrection-$ITKVERS -lITKCommon-$ITKVERS -lITKIOImageBase-$ITKVERS -lITKKLMRegionGrowing-$ITKVERS -lITKLabelMap-$ITKVERS -lITKMesh-$ITKVERS -lITKMetaIO-$ITKVERS -lITKOptimizers-$ITKVERS -lITKPath-$ITKVERS -lITKPolynomials-$ITKVERS -lITKQuadEdgeMesh-$ITKVERS -lITKSpatialObjects-$ITKVERS -lITKStatistics-$ITKVERS -lITKVNLInstantiation-$ITKVERS -lITKWatersheds-$ITKVERS -litkNetlibSlatec-$ITKVERS -litksys-$ITKVERS -litkv3p_lsqr-$ITKVERS -litkv3p_netlib-$ITKVERS -litkvcl-$ITKVERS -litkvnl-$ITKVERS -litkvnl_algo-$ITKVERS "
+                OTB_LDFLAGS="-L/usr/lib/x86_64-linux-gnu/ -lOTBImageIO-$OTBVERS -lOTBCommon-$OTBVERS -lOTBApplicationEngine-$OTBVERS -L$ITKPATH/lib $ITK_LDFLAGS"
         else
                 OTB_CPPFLAGS="-I$OTBPATH/include/otb/ApplicationEngine -I$OTBPATH/include/otb/Common -I$ITKPATH/include/ITK-$ITKVERS -I$OTBPATH/include/otb/Utilities/ITK -I$OTBPATH/include/otb/ -I$OTBPATH/include/otb/IO -I$OTBPATH/include/otb/UtilitiesAdapters/OssimAdapters -I$OTBPATH/include/otb/UtilitiesAdapters/CurlAdapters -I$OTBPATH/include/otb/Utilities/BGL -I$OTBPATH/include/otb/UtilitiesAdapters/ITKPendingPatches -I$OTBPATH/include/otb/Utilities/otbconfigfile $GDAL_CFLAGS"
-                OTB_LDFLAGS="-L$OTBPATH/lib/otb -lOTBIO -lOTBCommon -lOTBApplicationEngine -L$ITKPATH/lib -lITKBiasCorrection-$ITKVERS -lITKCommon-$ITKVERS -lITKIOImageBase-$ITKVERS -lITKKLMRegionGrowing-$ITKVERS -lITKLabelMap-$ITKVERS -lITKMesh-$ITKVERS -lITKMetaIO-$ITKVERS -lITKOptimizers-$ITKVERS -lITKPath-$ITKVERS -lITKPolynomials-$ITKVERS -lITKQuadEdgeMesh-$ITKVERS -lITKSpatialObjects-$ITKVERS -lITKStatistics-$ITKVERS -lITKVNLInstantiation-$ITKVERS -lITKWatersheds-$ITKVERS -litkNetlibSlatec-$ITKVERS -litksys-$ITKVERS -litkdouble-conversion-$ITKVERS -litkv3p_lsqr-$ITKVERS -litkv3p_netlib-$ITKVERS -litkvcl-$ITKVERS -litkvnl-$ITKVERS -litkvnl_algo-$ITKVERS -litkzlib-$ITKVERS"
+                OTB_LDFLAGS="-L$OTBPATH/lib/otb -lOTBIO -lOTBCommon -lOTBApplicationEngine -L$ITKPATH/lib $ITK_LDFLAGS"
 
         fi

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

@@ -791 +791 @@
          * check for useMapServer presence
          */
-        map* tmpCheck=getMap(tmpIoType->content,"useMapServer");
-        if(tmpCheck!=NULL){
-          // Get the default value
-          tmpIoType=getIoTypeFromElement(tmpInputs,tmpInputs->name,NULL);
-          tmpCheck=getMap(tmpMaps->content,"mimeType");
-          addToMap(tmpMaps->content,"requestedMimeType",tmpCheck->value);
-          map* cursor=tmpIoType->content;
-          while(cursor!=NULL){
-            addToMap(tmpMaps->content,cursor->name,cursor->value);
-            cursor=cursor->next;
-          }
+        if(tmpIoType!=NULL){
+          map* tmpCheck=getMap(tmpIoType->content,"useMapServer");
+          if(tmpCheck!=NULL){
+            // Get the default value
+            tmpIoType=getIoTypeFromElement(tmpInputs,tmpInputs->name,NULL);
+            tmpCheck=getMap(tmpMaps->content,"mimeType");
+            addToMap(tmpMaps->content,"requestedMimeType",tmpCheck->value);
+            map* cursor=tmpIoType->content;
+            while(cursor!=NULL){
+              addToMap(tmpMaps->content,cursor->name,cursor->value);
+              cursor=cursor->next;
+            }
           
-          cursor=tmpInputs->content;
-          while(cursor!=NULL){
-            if(strcasecmp(cursor->name,"Title")==0 ||
-               strcasecmp(cursor->name,"Abstract")==0)
-              addToMap(tmpMaps->content,cursor->name,cursor->value);
-           cursor=cursor->next;
+            cursor=tmpInputs->content;
+            while(cursor!=NULL){
+              if(strcasecmp(cursor->name,"Title")==0 ||
+                 strcasecmp(cursor->name,"Abstract")==0)
+                addToMap(tmpMaps->content,cursor->name,cursor->value);
+              cursor=cursor->next;
+            }
           }
         }

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

@@ -635 +635 @@
 iotype* getIoTypeFromElement(elements* e,char *name, map* values){
   elements* cursor=e;
-  if(values!=NULL)
+  if(values!=NULL){
     while(cursor!=NULL){
       if(strcasecmp(cursor->name,name)==0 && (cursor->defaults!=NULL || cursor->supported!=NULL)){
@@ -651 +651 @@
       cursor=cursor->next;
     }
+  }else{
+    while(cursor!=NULL){
+      if(strcasecmp(cursor->name,name)==0 && cursor->defaults!=NULL){
+        return cursor->defaults;
+      }
+      cursor=cursor->next;
+    }
+  }
   return NULL;
 }