Fix: sessiond: occasional badfd error on repeated SIGTERM

[lttng-tools.git] / src / common / utils.c

diff --git a/src/common/utils.c b/src/common/utils.c
index 17a313ee16f66efe8c574ddfddc8f94f156b9e11..7041a713bd7caa77e15a5dff69d688691824923f 100644 (file)
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -547,6 +547,7 @@ void utils_close_pipe(int *src)
                if (ret) {
                        PERROR("close pipe");
                }
+               src[i] = -1;
        }
 }
 
@@ -742,7 +743,8 @@ int utils_stream_file_path(const char *path_name, const char *file_name,
         char count_str[MAX_INT_DEC_LEN(count) + 1] = {};
        const char *path_separator;
 
-       if (path_name && path_name[strlen(path_name) - 1] == '/') {
+       if (path_name && (path_name[0] == '\0' ||
+                       path_name[strlen(path_name) - 1] == '/')) {
                path_separator = "";
        } else {
                path_separator = "/";