Commit 8201ff8e authored by Rusty Russell's avatar Rusty Russell

read_write_all: use calloc instead of huge stack var in tests.

Valgrind was giving a spurious error.
parent f50f3986
......@@ -26,11 +26,12 @@ static void got_signal(int sig)
int main(int argc, char *argv[])
{
char buffer[BUFSZ*2] = { 0 };
char *buffer;
char c = 0;
int status;
pid_t child;
buffer = calloc(BUFSZ, 2);
plan_tests(6);
/* We fork and torture parent. */
......@@ -44,7 +45,7 @@ int main(int argc, char *argv[])
/* Child. Make sure parent ready, then write in two parts. */
if (read(p2c[0], &c, 1) != 1)
exit(1);
memset(buffer, 0xff, sizeof(buffer));
memset(buffer, 0xff, BUFSZ*2);
if (!write_all(c2p[1], buffer, BUFSZ))
exit(2);
if (kill(getppid(), SIGUSR1) != 0)
......@@ -63,8 +64,8 @@ int main(int argc, char *argv[])
close(c2p[1]);
signal(SIGUSR1, got_signal);
ok1(write(p2c[1], &c, 1) == 1);
ok1(read_all(c2p[0], buffer, sizeof(buffer)));
ok1(memchr(buffer, 0, sizeof(buffer)) == NULL);
ok1(read_all(c2p[0], buffer, BUFSZ*2));
ok1(memchr(buffer, 0, BUFSZ*2) == NULL);
ok1(sigcount == 1);
ok1(wait(&status) == child);
ok(WIFEXITED(status) && WEXITSTATUS(status) == 0,
......
......@@ -24,11 +24,12 @@ static void got_signal(int sig)
int main(int argc, char *argv[])
{
char buffer[BUFSZ*2] = { 0 };
char *buffer;
int p2c[2];
int status;
pid_t child;
buffer = calloc(BUFSZ, 1);
plan_tests(4);
/* We fork and torture parent. */
......@@ -43,11 +44,11 @@ int main(int argc, char *argv[])
exit(1);
if (kill(getppid(), SIGUSR1) != 0)
exit(2);
if (!read_all(p2c[0], buffer+1, sizeof(buffer)-1))
if (!read_all(p2c[0], buffer+1, BUFSZ-1))
exit(3);
if (memchr(buffer, 0, sizeof(buffer))) {
if (memchr(buffer, 0, BUFSZ)) {
fprintf(stderr, "buffer has 0 at offset %ti\n",
memchr(buffer, 0, sizeof(buffer)) - (void *)buffer);
memchr(buffer, 0, BUFSZ) - (void *)buffer);
exit(4);
}
exit(0);
......@@ -56,9 +57,9 @@ int main(int argc, char *argv[])
err(1, "forking");
close(p2c[0]);
memset(buffer, 0xff, sizeof(buffer));
memset(buffer, 0xff, BUFSZ);
signal(SIGUSR1, got_signal);
ok1(write_all(p2c[1], buffer, sizeof(buffer)));
ok1(write_all(p2c[1], buffer, BUFSZ));
ok1(sigcount == 1);
ok1(wait(&status) == child);
ok(WIFEXITED(status) && WEXITSTATUS(status) == 0,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment