X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=libringbuffer%2Fshm.c;h=4afb0c6e25b57f0083d1feb4532b54cbb2b612ec;hb=dbafbbf5527d2e291b216216fd2c5b7dc4df66ed;hp=781295beb718c69057fb9ba54e89916fba5ad00c;hpb=7a7849896a95db678d916ccb7c5d91371828e3f8;p=lttng-ust.git

diff --git a/libringbuffer/shm.c b/libringbuffer/shm.c
index 781295be..4afb0c6e 100644
--- a/libringbuffer/shm.c
+++ b/libringbuffer/shm.c
@@ -17,6 +17,8 @@
 #include <signal.h>
 #include <dirent.h>
 #include <lttng/align.h>
+#include <helper.h>
+#include <limits.h>
 
 struct shm_object_table *shm_object_table_create(size_t max_nb_obj)
 {
@@ -210,10 +212,12 @@ void shmp_object_destroy(struct shm_object *obj)
 			assert(0);
 		}
 	}
-	ret = close(obj->shm_fd);
-	if (ret) {
-		PERROR("close");
-		assert(0);
+	if (obj->shm_fd >= 0) {
+		ret = close(obj->shm_fd);
+		if (ret) {
+			PERROR("close");
+			assert(0);
+		}
 	}
 	for (i = 0; i < 2; i++) {
 		if (obj->wait_fd[i] < 0)