system/glibc
3
0
Fork 0
Code Issues Projects Releases Wiki Activity

Test stdlib/test-bz22786 exits now with unsupported if malloc fails.

Browse Source 
The test tries to allocate more than 2^31 bytes which will always fail on s390
as it has maximum 2^31bit of memory.
Before commit 6c3a8a9d868a8deddf0d6dcc785b6d120de90523, this test returned
unsupported if malloc fails.  This patch re enables this behaviour.

Furthermore support_delete_temp_files() failed to remove the temp directory
in this case as it is not empty due to the created symlink.
Thus the creation of the symlink is moved behind malloc.

Reviewed-by: Carlos O'Donell <carlos@redhat.com>

ChangeLog:

	* stdlib/test-bz22786.c (do_test): Return EXIT_UNSUPPORTED
	if malloc fails.
This commit is contained in:
Stefan Liebler 2018-08-30 08:44:32 +02:00
parent 09c12efcaf
commit 3bad2358d6
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2018-08-30 Stefan Liebler <stli@linux.ibm.com>
* stdlib/test-bz22786.c (do_test): Return EXIT_UNSUPPORTED
if malloc fails.
2018-08-29 Joseph Myers <joseph@codesourcery.com> 2018-08-29 Joseph Myers <joseph@codesourcery.com>
* math/gen-libm-test.py (gen_test_args_res): Also treat plus_oflow * math/gen-libm-test.py (gen_test_args_res): Also treat plus_oflow

15
stdlib/test-bz22786.c
View File

@ -39,16 +39,25 @@ do_test (void)
const char *lnk = xasprintf ("%s/symlink", dir); const char *lnk = xasprintf ("%s/symlink", dir);
const size_t path_len = (size_t) INT_MAX + strlen (lnk) + 1; const size_t path_len = (size_t) INT_MAX + strlen (lnk) + 1;
TEST_VERIFY_EXIT (symlink (".", lnk) == 0);
DIAG_PUSH_NEEDS_COMMENT; DIAG_PUSH_NEEDS_COMMENT;
#if __GNUC_PREREQ (7, 0) #if __GNUC_PREREQ (7, 0)
/* GCC 7 warns about too-large allocations; here we need such /* GCC 7 warns about too-large allocations; here we need such
allocation to succeed for the test to work. */ allocation to succeed for the test to work. */
DIAG_IGNORE_NEEDS_COMMENT (7, "-Walloc-size-larger-than="); DIAG_IGNORE_NEEDS_COMMENT (7, "-Walloc-size-larger-than=");
#endif #endif
char *path = xmalloc (path_len); char *path = malloc (path_len);
DIAG_POP_NEEDS_COMMENT; DIAG_POP_NEEDS_COMMENT;
if (path == NULL)
{
printf ("malloc (%zu): %m\n", path_len);
/* On 31-bit s390 the malloc will always fail as we do not have
so much memory, and we want to mark the test unsupported.
Likewise on systems with little physical memory the test will
fail and should be unsupported. */
return EXIT_UNSUPPORTED;
}
TEST_VERIFY_EXIT (symlink (".", lnk) == 0);
/* Construct very long path = "/tmp/bz22786.XXXX/symlink/aaaa....." */ /* Construct very long path = "/tmp/bz22786.XXXX/symlink/aaaa....." */
char *p = mempcpy (path, lnk, strlen (lnk)); char *p = mempcpy (path, lnk, strlen (lnk));