aboutsummaryrefslogtreecommitdiff
path: root/string
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2018-02-06 21:43:20 +0000
committerJoseph Myers <joseph@codesourcery.com>2018-02-06 21:43:20 +0000
commitd92c2759976600decd8353730a5b5ce30c2758d8 (patch)
tree4f9db511947e9cf1e2c709bf070cfd6ee09acea5 /string
parentCorrect type of SSIZE_MAX for 32-bit (bug 13575). (diff)
downloadglibc-d92c2759976600decd8353730a5b5ce30c2758d8.tar.gz
glibc-d92c2759976600decd8353730a5b5ce30c2758d8.tar.bz2
glibc-d92c2759976600decd8353730a5b5ce30c2758d8.zip
Move string/testcopy.c to test-driver.c and xmalloc (bug 19667).
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. [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.
Diffstat (limited to 'string')
-rw-r--r--string/testcopy.c16
1 files changed, 9 insertions, 7 deletions
diff --git a/string/testcopy.c b/string/testcopy.c
index 61ede1c293..f14917befe 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>