AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-12 16:20:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

malloc/tst-valloc.c: Tidy up code.

Browse Source 
Add some comments and call free on all potentially allocated pointers.
Also remove duplicate check for NULL pointer.

ChangeLog:

2013-10-04  Will Newton  <will.newton@linaro.org>

	* malloc/tst-valloc.c: Add comments.
	(do_test): Add comments and call free on all potentially
	allocated pointers. Remove duplicate check for NULL pointer.
	Add space after cast.
This commit is contained in:
Will Newton 2013-10-03 11:26:34 +01:00
parent 1bc92709f3
commit 66a9be9d58
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -12,6 +12,11 @@
allocated pointers. Remove duplicate check for NULL pointer. allocated pointers. Remove duplicate check for NULL pointer.
Add space after cast. Add space after cast.
* malloc/tst-valloc.c: Add comments.
(do_test): Add comments and call free on all potentially
allocated pointers. Remove duplicate check for NULL pointer.
Add space after cast.
2013-10-04 Alan Modra <amodra@gmail.com> 2013-10-04 Alan Modra <amodra@gmail.com>
* sysdeps/powerpc/powerpc32/dl-machine.c (__process_machine_rela): * sysdeps/powerpc/powerpc32/dl-machine.c (__process_machine_rela):

20
malloc/tst-valloc.c
View File

@ -1,4 +1,5 @@
/* Copyright (C) 2013 Free Software Foundation, Inc. /* Test for valloc.
Copyright (C) 2013 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -34,12 +35,14 @@ static int
do_test (void) do_test (void)
{ {
void *p; void *p;
unsigned long pagesize = getpagesize(); unsigned long pagesize = getpagesize ();
unsigned long ptrval; unsigned long ptrval;
int save; int save;
errno = 0; errno = 0;
/* An attempt to allocate a huge value should return NULL and set
errno to ENOMEM. */
p = valloc (-1); p = valloc (-1);
save = errno; save = errno;
@ -50,8 +53,11 @@ do_test (void)
if (p == NULL && save != ENOMEM) if (p == NULL && save != ENOMEM)
merror ("valloc (-1) errno is not set correctly"); merror ("valloc (-1) errno is not set correctly");
free (p);
errno = 0; errno = 0;
/* Test to expose integer overflow in malloc internals from BZ #15856. */
p = valloc (-pagesize); p = valloc (-pagesize);
save = errno; save = errno;
@ -62,6 +68,10 @@ do_test (void)
if (p == NULL && save != ENOMEM) if (p == NULL && save != ENOMEM)
merror ("valloc (-pagesize) errno is not set correctly"); merror ("valloc (-pagesize) errno is not set correctly");
free (p);
/* A zero-sized allocation should succeed with glibc, returning a
non-NULL value. */
p = valloc (0); p = valloc (0);
if (p == NULL) if (p == NULL)
@ -69,15 +79,13 @@ do_test (void)
free (p); free (p);
/* Check the alignment of the returned pointer is correct. */
p = valloc (32); p = valloc (32);
if (p == NULL) if (p == NULL)
merror ("valloc (32) failed."); merror ("valloc (32) failed.");
ptrval = (unsigned long)p; ptrval = (unsigned long) p;
if (p == NULL)
merror ("valloc (32) failed.");
if ((ptrval & (pagesize - 1)) != 0) if ((ptrval & (pagesize - 1)) != 0)
merror ("returned pointer is not page aligned."); merror ("returned pointer is not page aligned.");