|
21 | 21 | #define msgpack_rand() drand48() |
22 | 22 | #endif // _MSC_VER || __MINGW32__ |
23 | 23 |
|
| 24 | +#if defined(_MSC_VER) |
| 25 | +#define msgpack_snprintf sprintf_s |
| 26 | +#else // _MSC_VER |
| 27 | +#define msgpack_snprintf snprintf |
| 28 | +#endif // _MSC_VER |
| 29 | + |
24 | 30 | using namespace std; |
25 | 31 |
|
26 | 32 | const unsigned int kLoop = 10000; |
@@ -1261,7 +1267,8 @@ TEST(MSGPACKC, simple_object_print_buffer_array_str) |
1261 | 1267 | EXPECT_EQ(str_size, o.via.str.size); |
1262 | 1268 | EXPECT_EQ(0, memcmp(str, o.via.str.ptr, str_size)); |
1263 | 1269 |
|
1264 | | - sprintf(expected, "[\"%s\"]", str); |
| 1270 | + msgpack_snprintf(expected, sizeof(expected), "[\"%s\"]", str); |
| 1271 | + expected[sizeof(expected) - 1] = '\0'; // not needed w/ sprintf_s |
1265 | 1272 | msgpack_object_print_buffer(buffer, sizeof(buffer) - 1, obj); |
1266 | 1273 | EXPECT_STREQ(expected, buffer); |
1267 | 1274 |
|
@@ -1341,7 +1348,8 @@ TEST(MSGPACKC, simple_object_print_buffer_map_str) |
1341 | 1348 | EXPECT_EQ(mval_size, val.via.str.size); |
1342 | 1349 | EXPECT_EQ(0, memcmp(mval, val.via.str.ptr, mval_size)); |
1343 | 1350 |
|
1344 | | - sprintf(expected, "{\"%s\"=>\"%s\"}", mkey, mval); |
| 1351 | + msgpack_snprintf(expected, sizeof(expected), "{\"%s\"=>\"%s\"}", mkey, mval); |
| 1352 | + expected[sizeof(expected) - 1] = '\0'; // not needed w/ sprintf_s |
1345 | 1353 | msgpack_object_print_buffer(buffer, sizeof(buffer) - 1, obj); |
1346 | 1354 | EXPECT_STREQ(expected, buffer); |
1347 | 1355 |
|
@@ -1384,7 +1392,8 @@ TEST(MSGPACKC, simple_object_print_buffer_map_str_empty) |
1384 | 1392 | EXPECT_EQ(MSGPACK_OBJECT_STR, val.type); |
1385 | 1393 | EXPECT_EQ(0UL, val.via.str.size); |
1386 | 1394 |
|
1387 | | - sprintf(expected, "{\"%s\"=>\"\"}", mkey); |
| 1395 | + msgpack_snprintf(expected, sizeof(expected), "{\"%s\"=>\"\"}", mkey); |
| 1396 | + expected[sizeof(expected) - 1] = '\0'; // not needed w/ sprintf_s |
1388 | 1397 | msgpack_object_print_buffer(buffer, sizeof(buffer) - 1, obj); |
1389 | 1398 | EXPECT_STREQ(expected, buffer); |
1390 | 1399 |
|
|
0 commit comments