X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fdispatch.c;h=bfe4455b59a9813174469e14c0688d3bddc1d942;hp=a637f23dea8e8e665b3a87b88644cc18a7337bb8;hb=2d97a0067600335f07eecb2c1d9ba68fc164583e;hpb=ea6bf30f3684cf71633cb9f2c70ea0bc22b664c4

diff --git a/src/bin/lttng-sessiond/dispatch.c b/src/bin/lttng-sessiond/dispatch.c
index a637f23de..bfe4455b5 100644
--- a/src/bin/lttng-sessiond/dispatch.c
+++ b/src/bin/lttng-sessiond/dispatch.c
@@ -304,6 +304,7 @@ static void *thread_dispatch_ust_registration(void *data)
 					}
 					lttng_fd_put(LTTNG_FD_APPS, 1);
 					free(ust_cmd);
+					ust_cmd = NULL;
 					goto error;
 				}
 				CDS_INIT_LIST_HEAD(&wait_node->head);
@@ -318,7 +319,9 @@ static void *thread_dispatch_ust_registration(void *data)
 					}
 					lttng_fd_put(LTTNG_FD_APPS, 1);
 					free(wait_node);
+					wait_node = NULL;
 					free(ust_cmd);
+					ust_cmd = NULL;
 					continue;
 				}
 				/*
@@ -329,6 +332,7 @@ static void *thread_dispatch_ust_registration(void *data)
 				wait_queue.count++;
 
 				free(ust_cmd);
+				ust_cmd = NULL;
 				/*
 				 * We have to continue here since we don't have the notify
 				 * socket and the application MUST be added to the hash table
@@ -349,6 +353,7 @@ static void *thread_dispatch_ust_registration(void *data)
 						wait_queue.count--;
 						app = wait_node->app;
 						free(wait_node);
+						wait_node = NULL;
 						DBG3("UST app notify socket %d is set", ust_cmd->sock);
 						break;
 					}
@@ -367,6 +372,7 @@ static void *thread_dispatch_ust_registration(void *data)
 					lttng_fd_put(LTTNG_FD_APPS, 1);
 				}
 				free(ust_cmd);
+				ust_cmd = NULL;
 			}
 
 			if (app) {