X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fuuid.cpp;h=4c64c08acedafe03de2e3d32b168146b97271134;hp=4a1038b330caf66e4be141bc251e5dcd14b965b6;hb=HEAD;hpb=88277a52069ed0135254ce29da617ebb6ecddbb8

diff --git a/src/common/uuid.cpp b/src/common/uuid.cpp
index 4a1038b33..4c64c08ac 100644
--- a/src/common/uuid.cpp
+++ b/src/common/uuid.cpp
@@ -6,6 +6,8 @@
  *
  */
 
+#include "uuid.hpp"
+
 #include <common/compat/string.hpp>
 #include <common/error.hpp>
 #include <common/format.hpp>
@@ -18,8 +20,6 @@
 #include <string.h>
 #include <time.h>
 
-#include "uuid.hpp"
-
 namespace {
 const lttng_uuid nil_uuid = {};
 bool lttng_uuid_is_init;
@@ -27,7 +27,7 @@ bool lttng_uuid_is_init;
 
 void lttng_uuid_to_str(const lttng_uuid& uuid, char *uuid_str)
 {
-	sprintf(uuid_str, LTTNG_UUID_FMT, LTTNG_UUID_FMT_VALUES(uuid));
+	snprintf(uuid_str, LTTNG_UUID_STR_LEN, LTTNG_UUID_FMT, LTTNG_UUID_FMT_VALUES(uuid));
 }
 
 std::string lttng::utils::uuid_to_str(const lttng_uuid& uuid)
@@ -45,7 +45,7 @@ std::string lttng::utils::uuid_to_str(const lttng_uuid& uuid)
 int lttng_uuid_from_str(const char *str_in, lttng_uuid& uuid_out)
 {
 	int ret = 0;
-	lttng_uuid uuid_scan;
+	lttng_uuid uuid_scan = {};
 
 	if (str_in == nullptr) {
 		ret = -1;
@@ -58,8 +58,7 @@ int lttng_uuid_from_str(const char *str_in, lttng_uuid& uuid_out)
 	}
 
 	/* Scan to a temporary location in case of a partial match. */
-	if (sscanf(str_in, LTTNG_UUID_FMT, LTTNG_UUID_SCAN_VALUES(uuid_scan)) !=
-			LTTNG_UUID_LEN) {
+	if (sscanf(str_in, LTTNG_UUID_FMT, LTTNG_UUID_SCAN_VALUES(uuid_scan)) != LTTNG_UUID_LEN) {
 		ret = -1;
 		goto end;
 	}
@@ -84,9 +83,9 @@ int lttng_uuid_generate(lttng_uuid& uuid_out)
 	if (!lttng_uuid_is_init) {
 		try {
 			srand(lttng::random::produce_best_effort_random_seed());
-		} catch (std::exception& e) {
+		} catch (const std::exception& e) {
 			ERR("Failed to initialize random seed during generation of UUID: %s",
-					e.what());
+			    e.what());
 			ret = -1;
 			goto end;
 		}