From: Will Newton <will.newton@linaro.org>
Date: Thu, 3 Oct 2013 10:26:34 +0000 (+0100)
Subject: malloc/tst-valloc.c: Tidy up code.
X-Git-Tag: upstream/2.20~1581
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=66a9be9d58e83856e398fbb484e7f2637d7f100b;p=platform%2Fupstream%2Flinaro-glibc.git

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

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.
---

diff --git a/ChangeLog b/ChangeLog
index 9781761..7a7b6bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,11 @@
 	allocated pointers. Remove duplicate check for NULL pointer.
 	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>
 
 	* sysdeps/powerpc/powerpc32/dl-machine.c (__process_machine_rela):
diff --git a/malloc/tst-valloc.c b/malloc/tst-valloc.c
index 3648f2f..4fd0dbb 100644
--- a/malloc/tst-valloc.c
+++ b/malloc/tst-valloc.c
@@ -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.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -34,12 +35,14 @@ static int
 do_test (void)
 {
   void *p;
-  unsigned long pagesize = getpagesize();
+  unsigned long pagesize = getpagesize ();
   unsigned long ptrval;
   int save;
 
   errno = 0;
 
+  /* An attempt to allocate a huge value should return NULL and set
+     errno to ENOMEM.  */
   p = valloc (-1);
 
   save = errno;
@@ -50,8 +53,11 @@ do_test (void)
   if (p == NULL && save != ENOMEM)
     merror ("valloc (-1) errno is not set correctly");
 
+  free (p);
+
   errno = 0;
 
+  /* Test to expose integer overflow in malloc internals from BZ #15856.  */
   p = valloc (-pagesize);
 
   save = errno;
@@ -62,6 +68,10 @@ do_test (void)
   if (p == NULL && save != ENOMEM)
     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);
 
   if (p == NULL)
@@ -69,15 +79,13 @@ do_test (void)
 
   free (p);
 
+  /* Check the alignment of the returned pointer is correct.  */
   p = valloc (32);
 
   if (p == NULL)
     merror ("valloc (32) failed.");
 
-  ptrval = (unsigned long)p;
-
-  if (p == NULL)
-    merror ("valloc (32) failed.");
+  ptrval = (unsigned long) p;
 
   if ((ptrval & (pagesize - 1)) != 0)
     merror ("returned pointer is not page aligned.");