mongodb: fix iterator crashes

Before this PR, the iterator `is_ok` status relied on `mongoc_cursor_more` that can return
true even if the iterator is terminated.
This PR fixes the problem by using the result of `mongoc_cursor_next` instead.

Signed-off-by: Alexandre Terrasa <alexandre@moz-code.org>

diff --git a/lib/mongodb/mongodb.nit b/lib/mongodb/mongodb.nit
index 889fc2e..fd753bd 100644 (file)
--- a/lib/mongodb/mongodb.nit
+++ b/lib/mongodb/mongodb.nit
@@ -561,7 +561,10 @@ class MongoCollection
                var c = native.find(query.to_bson.native)
                if c == null then return res
                var cursor = new MongoCursor(c)
-               for item in cursor do res.add item
+               while cursor.is_ok do
+                       res.add cursor.item
+                       cursor.next
+               end
                return res
        end
 
@@ -618,9 +621,9 @@ class MongoCursor
 
        init do next
 
-       redef fun is_ok do return native.more
+       redef var is_ok = true
 
-       redef fun next do native.next
+       redef fun next do is_ok = native.next
 
        redef fun item do
                return new JsonObject.from_bson(new BSON(native.current))

diff --git a/lib/mongodb/native_mongodb.nit b/lib/mongodb/native_mongodb.nit
index c28a218..e2e6213 100644 (file)
--- a/lib/mongodb/native_mongodb.nit
+++ b/lib/mongodb/native_mongodb.nit
@@ -524,11 +524,6 @@ extern class NativeMongoCursor `{ mongoc_cursor_t* `}
                return mongoc_cursor_next(self, &doc);
        `}
 
-       # Wrapper for `mongoc_cursor_more()`.
-       #
-       # This function shall indicate if there is more data to be read from the cursor.
-       fun more: Bool `{ return mongoc_cursor_more(self); `}
-
        # Wrapper for `mongoc_cursor_destroy()`.
        #
        # This instance should not be used beyond this point!