#416 Added iterator resource cleanup

cortoproject · Dec 2, 2015 · c760a2e · c760a2e
1 parent 02d847f
commit c760a2e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/packages/corto/lang/src/corto_ll.c b/packages/corto/lang/src/corto_ll.c
@@ -347,6 +347,7 @@ corto_iter _corto_llIter(corto_ll list, void *udata) {
     result.remove = corto_llIterRemove;
     result.insert = corto_llIterInsert;
     result.set = corto_llIterSet;
+    result.release = NULL;
 
     return result;
 }
@@ -361,6 +362,7 @@ corto_iter corto_llIterAlloc(corto_ll list) {
 
 void corto_llIterRelease(corto_iter *iter) {
     corto_dealloc(iter->udata);
+    iter->udata = NULL;
 }
 
 void corto_llIterMoveFirst(corto_iter* iter) {

diff --git a/packages/corto/lang/src/corto_select.c b/packages/corto/lang/src/corto_select.c
@@ -391,6 +391,10 @@ static void corto_selectRequestReplicators(
 
 static void corto_selectIterateReplicators(corto_selectData *data) {
     if (data->activeReplicators) {
+        if (data->currentReplicator < 0) {
+            data->currentReplicator = 0;
+        }
+
         /* Walk over iterators until one with data available has been found */
         while ((data->currentReplicator < data->activeReplicators)) {
             corto_resultIter *iter = &data->replicators[data->currentReplicator];
@@ -418,6 +422,7 @@ static void corto_selectIterateReplicators(corto_selectData *data) {
                 /* Return item */
                 break;
             } else {
+                corto_iterRelease(iter);
                 data->currentReplicator ++;
             }
         }