Skip to content

Commit 5e133b9

Browse files
committed
[MSan] Fix minor issues in testcases
Previously, 1. ifaddrs.cpp : mistake `size_t (xxx)` as `sizeof (xxx)`, resulting in inadequate checks. 2. qsort.cpp : mistake `kSize2` as `kSize1`, resulting in an unexpected buffer overlow issue.
1 parent 64bd4d9 commit 5e133b9

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

compiler-rt/test/msan/ifaddrs.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616

1717
#include <sanitizer/msan_interface.h>
1818

19-
#define CHECK_AND_PUSH(addr, size) \
20-
if (addr) { \
21-
assert(-1 == __msan_test_shadow(addr, sizeof(size))); \
22-
ranges.push_back(std::make_pair((void *)addr, (size_t)size)); \
19+
#define CHECK_AND_PUSH(addr, size) \
20+
if (addr) { \
21+
assert(-1 == __msan_test_shadow(addr, (size_t)(size))); \
22+
ranges.push_back(std::make_pair((void *)addr, (size_t)size)); \
2323
}
2424

2525
int main(int argc, char *argv[]) {
@@ -35,7 +35,7 @@ int main(int argc, char *argv[]) {
3535
assert(res == 0);
3636
assert(-1 == __msan_test_shadow(&ifas, sizeof(ifaddrs *)));
3737

38-
std::vector<std::pair<void *, size_t> > ranges;
38+
std::vector<std::pair<void *, size_t>> ranges;
3939
ifaddrs *p = ifas;
4040
while (p) {
4141
CHECK_AND_PUSH(p, sizeof(ifaddrs));

compiler-rt/test/msan/qsort.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ int compar1(const void *a, const void *b) {
5252
// kind of random
5353
for (int i = 0; i < kSize2; ++i)
5454
p[i] = i * 2 + (i % 3 - 1) * 3;
55-
qsort(p, kSize1, sizeof(long), compar2);
55+
qsort(p, kSize2, sizeof(long), compar2);
5656
__msan_check_mem_is_initialized(p, sizeof(long) * kSize2);
5757
delete[] p;
5858

0 commit comments

Comments
 (0)