Changeset 805 for trunk/zoo-project/zoo-kernel/service.c

Timestamp:

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

Author:

djay

Message:

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

File:

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

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;
 }