Merge 3e47aa9 into d257eb9

getsentry · Apr 24, 2023 · 5a4e93a · 5a4e93a
2 parents d257eb9 + 3e47aa9
commit 5a4e93a
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@
 
 - Ensure the current GPU frame rate is always reported for concurrent transaction profiling metrics (#2929)
 - Possible crash in Core Data tracking (#2865)
+- Convert one of the two remaining usages of `sprintf` to `snprintf` (#2866)
 
 ## 8.5.0
 

diff --git a/Sources/SentryCrash/Recording/Tools/SentryCrashJSONCodec.c b/Sources/SentryCrash/Recording/Tools/SentryCrashJSONCodec.c
@@ -342,8 +342,8 @@ sentrycrashjson_addUIntegerElement(
 {
  int result = sentrycrashjson_beginElement(context, name);
  unlikely_if(result != SentryCrashJSON_OK) { return result; }
- char buff[30];
- sprintf(buff, "%" PRIu64, value);
+ char buff[50];
+ snprintf(buff, sizeof(buff), "%" PRIu64, value);
  return addJSONData(context, buff, (int)strlen(buff));
 }
 

diff --git a/Tests/SentryTests/SentryCrash/SentryCrashJSONCodec_Tests.m b/Tests/SentryTests/SentryCrash/SentryCrashJSONCodec_Tests.m
@@ -1672,4 +1672,20 @@ - (void)testDontCloseLastContainer
  return result;
 }
 
+- (void)testFastUIntEncode
+{
+ char *expectedJson = "{\"uint\":1234567890}";
+
+ NSMutableData *encodedData = [NSMutableData data];
+ SentryCrashJSONEncodeContext context = { 0 };
+ sentrycrashjson_beginEncode(&context, false, addJSONData, (__bridge void *)(encodedData));
+ sentrycrashjson_beginObject(&context, NULL);
+ sentrycrashjson_addUIntegerElement(&context, "uint", 1234567890);
+ sentrycrashjson_endContainer(&context);
+ sentrycrashjson_endEncode(&context);
+ [encodedData appendBytes:"\0" length:1];
+
+ [self expectEquivalentJSON:encodedData.bytes toJSON:expectedJson];
+}
+
 @end