Change how errors are handled by iterators

[people/ms/libloc.git] / src / python / database.c

diff --git a/src/python/database.c b/src/python/database.c
index 954b5aceae975760e596c56c0ed945a7686119fa..48023b07c482d6755751a8f393acdef2984e68bf 100644 (file)
--- a/src/python/database.c
+++ b/src/python/database.c
@@ -311,8 +311,15 @@ static void DatabaseEnumerator_dealloc(DatabaseEnumeratorObject* self) {
 }
 
 static PyObject* DatabaseEnumerator_next(DatabaseEnumeratorObject* self) {
+       struct loc_network* network = NULL;
+
        // Enumerate all networks
-       struct loc_network* network = loc_database_enumerator_next_network(self->enumerator);
+       int r = loc_database_enumerator_next_network(self->enumerator, &network);
+       if (r) {
+               return NULL;
+       }
+
+       // A network was found
        if (network) {
                PyObject* obj = new_network(&NetworkType, network);
                loc_network_unref(network);
@@ -321,7 +328,13 @@ static PyObject* DatabaseEnumerator_next(DatabaseEnumeratorObject* self) {
        }
 
        // Enumerate all ASes
-       struct loc_as* as = loc_database_enumerator_next_as(self->enumerator);
+       struct loc_as* as = NULL;
+
+       r = loc_database_enumerator_next_as(self->enumerator, &as);
+       if (r) {
+               return NULL;
+       }
+
        if (as) {
                PyObject* obj = new_as(&ASType, as);
                loc_as_unref(as);