X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fbuffer-registry.c;h=5751b8d587f8a1a12a64a1b2fc207aaba22b0534;hp=765294fa4ca33f11fe9b4f331a3c46e4e3bb0ac3;hb=55d7e8605242476e653997d4d4ac2ee999b225f0;hpb=7972aab22f74b18faa168c0482216a3dd711a075

diff --git a/src/bin/lttng-sessiond/buffer-registry.c b/src/bin/lttng-sessiond/buffer-registry.c
index 765294fa4..5751b8d58 100644
--- a/src/bin/lttng-sessiond/buffer-registry.c
+++ b/src/bin/lttng-sessiond/buffer-registry.c
@@ -506,12 +506,14 @@ void buffer_reg_channel_destroy(struct buffer_reg_channel *regp,
 			buffer_reg_stream_destroy(sreg, domain);
 		}
 
-		ret = ust_ctl_release_object(-1, regp->obj.ust);
-		if (ret < 0 && ret != -EPIPE && ret != -LTTNG_UST_ERR_EXITING) {
-			ERR("Buffer reg channel release obj handle %d failed with ret %d",
-					regp->obj.ust->handle, ret);
+		if (regp->obj.ust) {
+			ret = ust_ctl_release_object(-1, regp->obj.ust);
+			if (ret < 0 && ret != -EPIPE && ret != -LTTNG_UST_ERR_EXITING) {
+				ERR("Buffer reg channel release obj handle %d failed with ret %d",
+						regp->obj.ust->handle, ret);
+			}
+			free(regp->obj.ust);
 		}
-		free(regp->obj.ust);
 		lttng_fd_put(LTTNG_FD_APPS, 1);
 		break;
 	}