This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.23-467-g850c676
- From: ppluzhnikov at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 11 Jun 2016 21:50:29 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.23-467-g850c676
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 850c67606e56e1a47fa0466e127f7b8ceda6ebe3 (commit)
from b7a9b7b05b6c5b4da16975065e37d6e0b8401a6c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=850c67606e56e1a47fa0466e127f7b8ceda6ebe3
commit 850c67606e56e1a47fa0466e127f7b8ceda6ebe3
Author: Paul Pluzhnikov <ppluzhnikov@google.com>
Date: Sat Jun 11 14:50:16 2016 -0700
2016-06-11 Paul Pluzhnikov <ppluzhnikov@google.com>
[BZ #19670]
[BZ #19672]
* io/test-lfs.c (do_prepare): Use xmalloc.
* io/tst-fcntl.c (do_prepare): Likewise.
* libio/tst-fopenloc.c (do_bz17916): Likewise.
* libio/tst-mmap2-eofsync.c (do_prepare): Likewise.
* posix/tst-exec.c (do_prepare): Likewise.
* posix/tst-pathconf.c (prepare): Likewise.
* posix/tst-spawn.c (do_prepare): Likewise.
* posix/tst-truncate.c (do_prepare): Likewise.
* rt/tst-aio.c (do_prepare): Likewise.
diff --git a/ChangeLog b/ChangeLog
index 32bef33..88a7b63 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2016-06-11 Paul Pluzhnikov <ppluzhnikov@google.com>
+
+ [BZ #19670]
+ [BZ #19672]
+
+ * io/test-lfs.c (do_prepare): Use xmalloc.
+ * io/tst-fcntl.c (do_prepare): Likewise.
+ * libio/tst-fopenloc.c (do_bz17916): Likewise.
+ * libio/tst-mmap2-eofsync.c (do_prepare): Likewise.
+ * posix/tst-exec.c (do_prepare): Likewise.
+ * posix/tst-pathconf.c (prepare): Likewise.
+ * posix/tst-spawn.c (do_prepare): Likewise.
+ * posix/tst-truncate.c (do_prepare): Likewise.
+ * rt/tst-aio.c (do_prepare): Likewise.
+
2016-06-11 Florian Weimer <fweimer@redhat.com>
[BZ #20237]
@@ -214,7 +229,7 @@
new entries in auto-propagate mode.
* nscd/grpcache.c (cache_addgr): Likewise.
-2016-06-09 Paul Pluzhnikov <ppluzhnikov@gmail.com>
+2016-06-09 Paul Pluzhnikov <ppluzhnikov@google.com>
* test-skeleton.c (oom_error, xmalloc, xcalloc, xrealloc):
New functions.
diff --git a/io/test-lfs.c b/io/test-lfs.c
index 3088a21..0c91177 100644
--- a/io/test-lfs.c
+++ b/io/test-lfs.c
@@ -53,7 +53,7 @@ do_prepare (int argc, char *argv[])
struct rlimit64 rlim;
name_len = strlen (test_dir);
- name = malloc (name_len + sizeof ("/lfsXXXXXX"));
+ name = xmalloc (name_len + sizeof ("/lfsXXXXXX"));
mempcpy (mempcpy (name, test_dir, name_len),
"/lfsXXXXXX", sizeof ("/lfsXXXXXX"));
diff --git a/io/tst-fcntl.c b/io/tst-fcntl.c
index 98a642e..e8782b0 100644
--- a/io/tst-fcntl.c
+++ b/io/tst-fcntl.c
@@ -47,7 +47,7 @@ do_prepare (int argc, char *argv[])
size_t name_len;
name_len = strlen (test_dir);
- name = malloc (name_len + sizeof ("/fcntlXXXXXX"));
+ name = xmalloc (name_len + sizeof ("/fcntlXXXXXX"));
mempcpy (mempcpy (name, test_dir, name_len),
"/fcntlXXXXXX", sizeof ("/fcntlXXXXXX"));
/* Create the temporary file. */
diff --git a/libio/tst-fopenloc.c b/libio/tst-fopenloc.c
index 0f7edb6..63ac540 100644
--- a/libio/tst-fopenloc.c
+++ b/libio/tst-fopenloc.c
@@ -26,9 +26,13 @@
#include <wchar.h>
#include <sys/resource.h>
-
static const char inputfile[] = "../iconvdata/testdata/ISO-8859-1";
+static int do_test(void);
+
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"
+
static int
do_bz17916 (void)
{
@@ -39,7 +43,7 @@ do_bz17916 (void)
setrlimit (RLIMIT_STACK, &rl);
const size_t sz = 2 * 1024 * 1024;
- char *ccs = malloc (sz);
+ char *ccs = xmalloc (sz);
strcpy (ccs, "r,ccs=");
memset (ccs + 6, 'A', sz - 6 - 1);
ccs[sz - 1] = '\0';
@@ -85,6 +89,3 @@ do_test (void)
return do_bz17916 ();
}
-
-#define TEST_FUNCTION do_test ()
-#include "../test-skeleton.c"
diff --git a/libio/tst-mmap2-eofsync.c b/libio/tst-mmap2-eofsync.c
index f369965..05dedb8 100644
--- a/libio/tst-mmap2-eofsync.c
+++ b/libio/tst-mmap2-eofsync.c
@@ -20,7 +20,7 @@ static char *pages;
static void
do_prepare (void)
{
- pages = malloc (getpagesize () * 2);
+ pages = xmalloc (getpagesize () * 2);
memset (pages, 'a', getpagesize ());
memset (pages + getpagesize (), 'b', getpagesize ());
diff --git a/login/tst-utmp.c b/login/tst-utmp.c
index 2fb20b6..348854a 100644
--- a/login/tst-utmp.c
+++ b/login/tst-utmp.c
@@ -62,7 +62,7 @@ do_prepare (int argc, char *argv[])
size_t name_len;
name_len = strlen (test_dir);
- name = malloc (name_len + sizeof ("/utmpXXXXXX"));
+ name = xmalloc (name_len + sizeof ("/utmpXXXXXX"));
mempcpy (mempcpy (name, test_dir, name_len),
"/utmpXXXXXX", sizeof ("/utmpXXXXXX"));
diff --git a/posix/tst-exec.c b/posix/tst-exec.c
index b0b04b5..ef1638a 100644
--- a/posix/tst-exec.c
+++ b/posix/tst-exec.c
@@ -59,12 +59,12 @@ do_prepare (int argc, char *argv[])
size_t name_len;
name_len = strlen (test_dir);
- name1 = malloc (name_len + sizeof ("/execXXXXXX"));
+ name1 = xmalloc (name_len + sizeof ("/execXXXXXX"));
mempcpy (mempcpy (name1, test_dir, name_len),
"/execXXXXXX", sizeof ("/execXXXXXX"));
add_temp_file (name1);
- name2 = malloc (name_len + sizeof ("/execXXXXXX"));
+ name2 = xmalloc (name_len + sizeof ("/execXXXXXX"));
mempcpy (mempcpy (name2, test_dir, name_len),
"/execXXXXXX", sizeof ("/execXXXXXX"));
add_temp_file (name2);
diff --git a/posix/tst-pathconf.c b/posix/tst-pathconf.c
index 949fc65..4f51ae8 100644
--- a/posix/tst-pathconf.c
+++ b/posix/tst-pathconf.c
@@ -41,12 +41,7 @@ prepare (void)
static const char dir_name[] = "/tst-pathconf.XXXXXX";
size_t dirbuflen = test_dir_len + sizeof (dir_name);
- dirbuf = malloc (dirbuflen);
- if (dirbuf == NULL)
- {
- puts ("Out of memory");
- exit (1);
- }
+ dirbuf = xmalloc (dirbuflen);
snprintf (dirbuf, dirbuflen, "%s%s", test_dir, dir_name);
if (mkdtemp (dirbuf) == NULL)
@@ -73,7 +68,7 @@ do_test (void)
static const char *fifo_name = "some-fifo";
size_t filenamelen = strlen (dirbuf) + strlen (fifo_name) + 2;
- char *filename = malloc (filenamelen);
+ char *filename = xmalloc (filenamelen);
snprintf (filename, filenamelen, "%s/%s", dirbuf, fifo_name);
diff --git a/posix/tst-spawn.c b/posix/tst-spawn.c
index c046098..6c8d718 100644
--- a/posix/tst-spawn.c
+++ b/posix/tst-spawn.c
@@ -63,17 +63,17 @@ do_prepare (int argc, char *argv[])
size_t name_len;
name_len = strlen (test_dir);
- name1 = (char *) malloc (name_len + sizeof ("/spawnXXXXXX"));
+ name1 = (char *) xmalloc (name_len + sizeof ("/spawnXXXXXX"));
mempcpy (mempcpy (name1, test_dir, name_len),
"/spawnXXXXXX", sizeof ("/spawnXXXXXX"));
add_temp_file (name1);
- name2 = (char *) malloc (name_len + sizeof ("/spawnXXXXXX"));
+ name2 = (char *) xmalloc (name_len + sizeof ("/spawnXXXXXX"));
mempcpy (mempcpy (name2, test_dir, name_len),
"/spawnXXXXXX", sizeof ("/spawnXXXXXX"));
add_temp_file (name2);
- name3 = (char *) malloc (name_len + sizeof ("/spawnXXXXXX"));
+ name3 = (char *) xmalloc (name_len + sizeof ("/spawnXXXXXX"));
mempcpy (mempcpy (name3, test_dir, name_len),
"/spawnXXXXXX", sizeof ("/spawnXXXXXX"));
add_temp_file (name3);
diff --git a/posix/tst-truncate.c b/posix/tst-truncate.c
index 8f5957f..99bddb3 100644
--- a/posix/tst-truncate.c
+++ b/posix/tst-truncate.c
@@ -59,7 +59,7 @@ do_prepare (int argc, char *argv[])
#define FNAME2(s) "/" STRINGIFY(s) "XXXXXX"
name_len = strlen (test_dir);
- name = malloc (name_len + sizeof (FNAME));
+ name = xmalloc (name_len + sizeof (FNAME));
mempcpy (mempcpy (name, test_dir, name_len), FNAME, sizeof (FNAME));
add_temp_file (name);
diff --git a/rt/tst-aio.c b/rt/tst-aio.c
index 9ca3775..1ad9c60 100644
--- a/rt/tst-aio.c
+++ b/rt/tst-aio.c
@@ -51,7 +51,7 @@ do_prepare (int argc, char *argv[])
size_t name_len;
name_len = strlen (test_dir);
- name = malloc (name_len + sizeof ("/aioXXXXXX"));
+ name = xmalloc (name_len + sizeof ("/aioXXXXXX"));
mempcpy (mempcpy (name, test_dir, name_len),
"/aioXXXXXX", sizeof ("/aioXXXXXX"));
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 17 ++++++++++++++++-
io/test-lfs.c | 2 +-
io/tst-fcntl.c | 2 +-
libio/tst-fopenloc.c | 11 ++++++-----
libio/tst-mmap2-eofsync.c | 2 +-
login/tst-utmp.c | 2 +-
posix/tst-exec.c | 4 ++--
posix/tst-pathconf.c | 9 ++-------
posix/tst-spawn.c | 6 +++---
posix/tst-truncate.c | 2 +-
rt/tst-aio.c | 2 +-
11 files changed, 35 insertions(+), 24 deletions(-)
hooks/post-receive
--
GNU C Library master sources