Skip to content

Commit d577628

Browse files
committed
address few comments
1 parent 01f2e37 commit d577628

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

compiler-rt/lib/sanitizer_common/sanitizer_libc.cpp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,11 @@ void *internal_memccpy(void *dest, const void *src, int c, uptr n) {
5353
char *d = (char *)dest;
5454
const char *s = (const char *)src;
5555
uptr i = 0;
56-
for (; i < n && s[i] != c; ++i) d[i] = s[i];
57-
if (n > 0 && i < n - 1)
56+
for (; i < n; ++i) {
57+
d[i] = s[i];
58+
if (s[i] == c) break;
59+
}
60+
if (n > 0 && i < n)
5861
return d + i + 1;
5962
return nullptr;
6063
}

compiler-rt/test/memprof/TestCases/memprof_memccpy.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77

88
int main() {
99
char *p = strdup("memccpy");
10-
char *d = (char *)malloc(4);
10+
char *d = (char *)malloc(5);
1111
void *r = memccpy(d, p, 'c', 8);
12-
int cmp = memcmp(r, "mem", 3);
12+
int cmp = memcmp(r, "memc", 4);
1313
free(d);
1414
free(p);
1515
return cmp;

0 commit comments

Comments
 (0)