Fix unsafe type cast and CRT call (open-telemetry#518)

TomRoSystems · Jan 15, 2021 · bcfcc82 · bcfcc82
1 parent 8702a10
commit bcfcc82
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/exporters/etw/include/opentelemetry/exporters/etw/etw_provider_exporter.h b/exporters/etw/include/opentelemetry/exporters/etw/etw_provider_exporter.h
@@ -408,7 +408,7 @@ class ETWProvider
     EVENT_DESCRIPTOR evtDescriptor;
     EventDescCreate(&evtDescriptor, 0, 0x1, 0, 0, 0, 0, 0);
     EVENT_DATA_DESCRIPTOR evtData[1];
-    EventDataDescCreate(&evtData[0], v.data(), v.size());
+    EventDataDescCreate(&evtData[0], v.data(), static_cast<ULONG>(v.size()));
 
     auto writeResponse = EventWrite(providerData.providerHandle, &evtDescriptor, 1, evtData);
 

diff --git a/exporters/etw/include/opentelemetry/exporters/etw/uuid.h b/exporters/etw/include/opentelemetry/exporters/etw/uuid.h
@@ -99,11 +99,11 @@ struct UUID
     unsigned int p1, p2, p3, p4, p5, p6, p7, p8, p9, p10;
     if (
         // Parse input with dashes
-        (11 == sscanf(str, "%08lX-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X", &p0, &p1, &p2, &p3,
-                      &p4, &p5, &p6, &p7, &p8, &p9, &p10)) ||
+        (11 == sscanf_s(str, "%08lX-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X", &p0, &p1, &p2,
+                        &p3, &p4, &p5, &p6, &p7, &p8, &p9, &p10)) ||
         // Parse input without dashes
-        (11 == sscanf(str, "%08lX%04X%04X%02X%02X%02X%02X%02X%02X%02X%02X", &p0, &p1, &p2, &p3, &p4,
-                      &p5, &p6, &p7, &p8, &p9, &p10)))
+        (11 == sscanf_s(str, "%08lX%04X%04X%02X%02X%02X%02X%02X%02X%02X%02X", &p0, &p1, &p2, &p3,
+                        &p4, &p5, &p6, &p7, &p8, &p9, &p10)))
     {
       Data1    = static_cast<uint32_t>(p0);
       Data2    = static_cast<uint16_t>(p1);