fix crash when consume depleted ops (#3194)

RedisGraph · Sep 26, 2023 · 3e4f953 · 3e4f953
1 parent 1e3b249
commit 3e4f953
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 3 deletions.
diff --git a/src/execution_plan/ops/op_create.c b/src/execution_plan/ops/op_create.c
@@ -133,7 +133,7 @@ static Record _handoff
 (
 	OpCreate *op
 ) {
-	return array_pop(op->records);
+	return (array_len(op->records)) ? array_pop(op->records) : NULL;
 }
 
 static Record CreateConsume

diff --git a/src/execution_plan/ops/op_delete.c b/src/execution_plan/ops/op_delete.c
@@ -191,7 +191,7 @@ static inline void _CollectDeletedEntities(Record r, OpBase *opBase) {
 }
 
 static inline Record _handoff(OpDelete *op) {
-	return array_pop(op->records);
+	return (array_len(op->records)) ? array_pop(op->records) : NULL;
 }
 
 static Record DeleteConsume(OpBase *opBase) {

diff --git a/src/execution_plan/ops/op_foreach.c b/src/execution_plan/ops/op_foreach.c
@@ -76,7 +76,7 @@ static OpResult ForeachInit
 // otherwise, returns NULL (last value in op->records)
 static Record _handoff(OpForeach *op) {
 	ASSERT(op->records != NULL);
-	return array_pop(op->records);
+	return (array_len(op->records)) ? array_pop(op->records) : NULL;
 }
 
 // the Foreach consume function aggregates all the records from the supplier if

diff --git a/tests/flow/test_traversal_construction.py b/tests/flow/test_traversal_construction.py
@@ -413,3 +413,30 @@ def test_traverse_zero_length_edge(self):
         result = graph.query(q).result_set
         self.env.assertTrue(result == expected)
 
+    def test_consume_depleted_ops(self):
+        # as op conditional traverse can call consume on its children
+        # validate that the children not crash
+
+        graph.query("CREATE (:A)-[:R]->(:B)")
+
+        # test op_create
+        graph.query("""CREATE (x:X)
+                    WITH *
+                    MATCH (:A)-[r:R]->(b:B)
+                    RETURN x""")
+
+        # test op_delete
+        graph.query("""MATCH (x:X)
+                    DELETE x
+                    WITH *
+                    MATCH (a)-[r:R]->(b:B)
+                    RETURN x""")
+
+        graph.query("CREATE (x:X)")
+
+        # test op_foreach
+        graph.query("""MATCH (x:X)
+                    FOREACH(i in range(0, 4) | CREATE (x1:X))
+                    WITH *
+                    MATCH (a)-[r:R]->(b:B)
+                    RETURN x""")