projects
/
libc-test
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
cc0b995
)
fix string_memset so buffers are aligned properly
author
Szabolcs Nagy
<nsz@port70.net>
Thu, 5 Mar 2015 23:45:48 +0000
(
00:45
+0100)
committer
Szabolcs Nagy
<nsz@port70.net>
Thu, 5 Mar 2015 23:45:48 +0000
(
00:45
+0100)
src/functional/string_memset.c
patch
|
blob
|
history
diff --git
a/src/functional/string_memset.c
b/src/functional/string_memset.c
index
baea112
..
c85ade2
100644
(file)
--- a/
src/functional/string_memset.c
+++ b/
src/functional/string_memset.c
@@
-21,7
+21,7
@@
static void test_align(int align, int len)
char *p;
int i;
char *p;
int i;
- if (
s - buf + len >= N
)
+ if (
len + 64 > buf + N - s || len + 64 > buf2 + N - want
)
abort();
for (i = 0; i < N; i++)
buf[i] = buf2[i] = ' ';
abort();
for (i = 0; i < N; i++)
buf[i] = buf2[i] = ' ';
@@
-30,11
+30,11
@@
static void test_align(int align, int len)
p = pmemset(s, '#', len);
if (p != s)
t_error("memset(%p,...) returned %p\n", s, p);
p = pmemset(s, '#', len);
if (p != s)
t_error("memset(%p,...) returned %p\n", s, p);
- for (i =
0; i < N
; i++)
- if (
buf[i] != buf2
[i]) {
+ for (i =
-64; i < len+64
; i++)
+ if (
s[i] != want
[i]) {
t_error("memset(align %d, '#', %d) failed at pos %d\n", align, len, i);
t_error("memset(align %d, '#', %d) failed at pos %d\n", align, len, i);
- t_printf("got : '%.*s'\n",
N, buf
);
- t_printf("want: '%.*s'\n",
N, buf2
);
+ t_printf("got : '%.*s'\n",
len+128, s-64
);
+ t_printf("want: '%.*s'\n",
len+128, want-64
);
break;
}
}
break;
}
}