Fix: save: leak of configuration file fd

Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/src/bin/lttng-sessiond/save.c b/src/bin/lttng-sessiond/save.c
index 9ac7712cb114968fdb8c3c4605a4f2f10419037b..1a879b21429892e1f1af1465af9c790b5f7270b5 100644 (file)
--- a/src/bin/lttng-sessiond/save.c
+++ b/src/bin/lttng-sessiond/save.c
@@ -2053,6 +2053,13 @@ end:
                }
        }
 
                }
        }
 

+       if (file_opened) {
+               ret = close(fd);
+               if (ret) {
+                       PERROR("Closing XML session configuration");
+               }
+       }
+

        return ret;
 }
 
        return ret;
 }
 

diff --git a/src/common/config/session-config.h b/src/common/config/session-config.h
index c6439f756fc431c636a4383c589d6d43c929dff0..f48ff74ae6f54384279115c424105c76fc8cce38 100644 (file)
--- a/src/common/config/session-config.h
+++ b/src/common/config/session-config.h
@@ -85,8 +85,8 @@ int config_parse_value(const char *value);
 /*
  * Create an instance of a configuration writer.
  *
 /*
  * Create an instance of a configuration writer.
  *

- * fd_output File to which the XML content must be written. The file will be
- * closed once the config_writer has been destroyed.
+ * fd_output File to which the XML content must be written. fd_output is
+ * owned by the caller.

  *
  * indent If other than 0 the XML will be pretty printed
  * with indentation and newline.
  *
  * indent If other than 0 the XML will be pretty printed
  * with indentation and newline.