Fix: sessiond: ODR violation results in memory corruption

[lttng-tools.git] / tests / utils / xml-utils / validate_xml.cpp

diff --git a/tests/utils/xml-utils/validate_xml.cpp b/tests/utils/xml-utils/validate_xml.cpp
index 8e30100c0bcf5cd2f11e249d7f3a259d856a61f1..887f7af524c146a2f1f6d8b5ecd2ee018cc981c3 100644 (file)
--- a/tests/utils/xml-utils/validate_xml.cpp
+++ b/tests/utils/xml-utils/validate_xml.cpp
@@ -25,15 +25,15 @@
 #include <libxml/parser.h>
 
 #include <lttng/lttng-error.h>
-#include <common/macros.h>
-
-#include <common/macros.h>
+#include <common/macros.hpp>
 
+namespace {
 struct validation_ctx {
        xmlSchemaParserCtxtPtr parser_ctx;
        xmlSchemaPtr schema;
        xmlSchemaValidCtxtPtr schema_validation_ctx;
 };
+} /* namespace */
 
 enum command_err_code {
        CMD_SUCCESS = 0,
@@ -147,14 +147,16 @@ static int validate_xml(const char *xml_file_path, struct validation_ctx *ctx)
 
        ret = CMD_SUCCESS;
 end:
+       if (doc) {
+               xmlFreeDoc(doc);
+       }
        return ret;
-
-
 }
+
 int main(int argc, char **argv)
 {
        int ret;
-       struct validation_ctx ctx = { 0 };
+       struct validation_ctx ctx = {};
 
        /* Check if we have all argument */
        if (argc < 3) {