Fix the backported fix for #13 (adds a NULL check).

89872065 · Geoff Simmons · 3916146f · 89872065
Commit 89872065 authored Apr 11, 2023 by Geoff Simmons
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 5 deletions

node.c src/node.c +7 -5

No files found.
--- a/src/node.c
+++ b/src/node.c
@@ -624,11 +624,13 @@ fini_subreq(const struct vdp_ctx *vdx, struct node *node)

 	assert(node->type == T_SUBREQ);

-	CAST_OBJ_NOTNULL(subreq, node->subreq.req, REQ_MAGIC);
-	CAST_OBJ_NOTNULL(pesi, subreq->transport_priv, PESI_MAGIC);
-	CHECK_OBJ_NOTNULL(pesi->pesi_tree, PESI_TREE_MAGIC);
-	CHECK_OBJ_NOTNULL(pesi->pesi_tree->tree, BYTES_TREE_MAGIC);
-	subreq_wait_done(node, pesi->pesi_tree->tree);
+	if (node->subreq.req != NULL) {
+		CAST_OBJ(subreq, node->subreq.req, REQ_MAGIC);
+		CAST_OBJ_NOTNULL(pesi, subreq->transport_priv, PESI_MAGIC);
+		CHECK_OBJ_NOTNULL(pesi->pesi_tree, PESI_TREE_MAGIC);
+		CHECK_OBJ_NOTNULL(pesi->pesi_tree->tree, BYTES_TREE_MAGIC);
+		subreq_wait_done(node, pesi->pesi_tree->tree);
+	}

 	AN(node->subreq.done);