This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Move string/testcopy.c to test-driver.c and xmalloc (bug 19667)
- From: Joseph Myers <joseph at codesourcery dot com>
- To: <libc-alpha at sourceware dot org>
- Date: Thu, 1 Feb 2018 20:36:35 +0000
- Subject: Move string/testcopy.c to test-driver.c and xmalloc (bug 19667)
- Authentication-results: sourceware.org; auth=none
Bug 19667 reports unchecked malloc calls in the test
string/testcopy.c. This patch makes that test use xmalloc and the
support/test-driver.c test framework.
Tested for x86_64.
2018-02-01 Joseph Myers <joseph@codesourcery.com>
[BZ #19667]
* string/testcopy.c: Include <support/support.h>. Do not include
<malloc.h>. Use <support/test-driver.c>.
(main): Rename to do_test. Make static. Use xmalloc instead of
malloc.
diff --git a/string/testcopy.c b/string/testcopy.c
index 61ede1c..f14917b 100644
--- a/string/testcopy.c
+++ b/string/testcopy.c
@@ -19,10 +19,10 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
-#include <malloc.h>
+#include <support/support.h>
-int
-main (void)
+static int
+do_test (void)
{
char *mem, *memp;
char *rand_mem;
@@ -34,10 +34,10 @@ main (void)
max_size = 256;
- mem = malloc (max_size + 2 * max_size + 2 * space_around);
- rand_mem = malloc (max_size);
- lo_around = malloc (space_around);
- hi_around = malloc (space_around);
+ mem = xmalloc (max_size + 2 * max_size + 2 * space_around);
+ rand_mem = xmalloc (max_size);
+ lo_around = xmalloc (space_around);
+ hi_around = xmalloc (space_around);
memp = mem + space_around;
/* Fill RAND_MEM with random bytes, each non-zero. */
@@ -105,3 +105,5 @@ main (void)
return 0;
}
+
+#include <support/test-driver.c>
--
Joseph S. Myers
joseph@codesourcery.com