From 95a47720311d8bdded870135fa62323cf3d2a93e Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Wed, 6 May 2026 13:50:02 +0200
Subject: [PATCH] modules: handle get_registry NULL return value

---
 src/modules/module-combine-stream.c | 4 ++++
 src/modules/module-rtp-sap.c        | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/src/modules/module-combine-stream.c b/src/modules/module-combine-stream.c
index 1af2ccd22..9a5776be5 100644
--- a/src/modules/module-combine-stream.c
+++ b/src/modules/module-combine-stream.c
@@ -1723,6 +1723,10 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
 		goto error;
 
 	impl->registry = pw_core_get_registry(impl->core, PW_VERSION_REGISTRY, 0);
+	if (impl->registry == NULL) {
+		res = -errno;
+		goto error;
+	}
 	pw_registry_add_listener(impl->registry, &impl->registry_listener,
 			&registry_events, impl);
 
diff --git a/src/modules/module-rtp-sap.c b/src/modules/module-rtp-sap.c
index 9a8208c15..3d4cfa086 100644
--- a/src/modules/module-rtp-sap.c
+++ b/src/modules/module-rtp-sap.c
@@ -2189,6 +2189,10 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
 		goto out;
 
 	impl->registry = pw_core_get_registry(impl->core, PW_VERSION_REGISTRY, 0);
+	if (impl->registry == NULL) {
+		res = -errno;
+		goto out;
+	}
 	pw_registry_add_listener(impl->registry, &impl->registry_listener,
 			&registry_events, impl);