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.18-96-ga9f5ce0
- From: allan at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 9 Sep 2013 12:57:15 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.18-96-ga9f5ce0
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 a9f5ce099cb30fe6b8f2ba240cacffe7ecfbfef2 (commit)
via 34829bc28f727ad9db6a180191c62d33f67b7915 (commit)
via 3932737df1a022f8f207db9874194600296ed437 (commit)
from 83e43bf0b756065dc640680d90fa6f0b39425182 (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=a9f5ce099cb30fe6b8f2ba240cacffe7ecfbfef2
commit a9f5ce099cb30fe6b8f2ba240cacffe7ecfbfef2
Author: Allan McRae <allan@archlinux.org>
Date: Mon Sep 9 22:54:07 2013 +1000
Fix typo in strcoll example
diff --git a/ChangeLog b/ChangeLog
index 496a236..9b73de5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2013-09-09 Allan McRae <allan@archlinux.org>
+ [BZ #15939]
+ * manual/string.texi (Collation Functions): Fix typo in
+ strcoll example.
+ Reported by Suren Karapetyan <me@suren.karapetyan.name>.
+
[BZ #15893]
* stdlib/isomac.c (get_null_defines): Fix memory leak.
diff --git a/NEWS b/NEWS
index 9d128ae..e3eb389 100644
--- a/NEWS
+++ b/NEWS
@@ -11,7 +11,7 @@ Version 2.19
14155, 14699, 15427, 15522, 15531, 15532, 15736, 15749, 15797, 15844,
15867, 15886, 15887, 15890, 15892, 15893, 15895, 15897, 15905, 15909,
- 15921.
+ 15921, 15939.
* CVE-2013-4237 The readdir_r function could write more than NAME_MAX bytes
to the d_name member of struct dirent, or omit the terminating NUL
diff --git a/manual/string.texi b/manual/string.texi
index 2a164a9..3329761 100644
--- a/manual/string.texi
+++ b/manual/string.texi
@@ -1370,7 +1370,7 @@ int
compare_elements (const void *v1, const void *v2)
@{
char * const *p1 = v1;
- char * const *p1 = v2;
+ char * const *p2 = v2;
return strcoll (*p1, *p2);
@}
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=34829bc28f727ad9db6a180191c62d33f67b7915
commit 34829bc28f727ad9db6a180191c62d33f67b7915
Author: Allan McRae <allan@archlinux.org>
Date: Mon Sep 9 22:52:58 2013 +1000
Fix memory leak in stdlib/isomac.c
diff --git a/ChangeLog b/ChangeLog
index 30c6a39..496a236 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2013-09-09 Allan McRae <allan@archlinux.org>
+ [BZ #15893]
+ * stdlib/isomac.c (get_null_defines): Fix memory leak.
+
[BZ #15892]
* libio/memstream.c (open_memstream): Fix memory leak.
* libio/wmemstream.c (open_wmemstream): Likewise.
diff --git a/NEWS b/NEWS
index 72c10e6..9d128ae 100644
--- a/NEWS
+++ b/NEWS
@@ -10,7 +10,8 @@ Version 2.19
* The following bugs are resolved with this release:
14155, 14699, 15427, 15522, 15531, 15532, 15736, 15749, 15797, 15844,
- 15867, 15886, 15887, 15890, 15892, 15895, 15897, 15905, 15909, 15921.
+ 15867, 15886, 15887, 15890, 15892, 15893, 15895, 15897, 15905, 15909,
+ 15921.
* CVE-2013-4237 The readdir_r function could write more than NAME_MAX bytes
to the d_name member of struct dirent, or omit the terminating NUL
diff --git a/stdlib/isomac.c b/stdlib/isomac.c
index 2c9009b..621b515 100644
--- a/stdlib/isomac.c
+++ b/stdlib/isomac.c
@@ -263,6 +263,7 @@ get_null_defines (void)
if (system (command))
{
puts ("system() returned nonzero");
+ free (command);
return NULL;
}
free (command);
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=3932737df1a022f8f207db9874194600296ed437
commit 3932737df1a022f8f207db9874194600296ed437
Author: Allan McRae <allan@archlinux.org>
Date: Mon Sep 9 22:50:41 2013 +1000
Fix memory leaks in libio on allocation failure
diff --git a/ChangeLog b/ChangeLog
index 306dda7..30c6a39 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2013-09-09 Allan McRae <allan@archlinux.org>
+ [BZ #15892]
+ * libio/memstream.c (open_memstream): Fix memory leak.
+ * libio/wmemstream.c (open_wmemstream): Likewise.
+
[BZ #15895]
* nscd/netgroupcache.c: Fix nesting of ifdefs.
diff --git a/NEWS b/NEWS
index 5ade03c..72c10e6 100644
--- a/NEWS
+++ b/NEWS
@@ -10,7 +10,7 @@ Version 2.19
* The following bugs are resolved with this release:
14155, 14699, 15427, 15522, 15531, 15532, 15736, 15749, 15797, 15844,
- 15867, 15886, 15887, 15890, 15895, 15897, 15905, 15909, 15921.
+ 15867, 15886, 15887, 15890, 15892, 15895, 15897, 15905, 15909, 15921.
* CVE-2013-4237 The readdir_r function could write more than NAME_MAX bytes
to the d_name member of struct dirent, or omit the terminating NUL
diff --git a/libio/memstream.c b/libio/memstream.c
index 34534e2..3cb1bd7 100644
--- a/libio/memstream.c
+++ b/libio/memstream.c
@@ -84,7 +84,10 @@ open_memstream (bufloc, sizeloc)
buf = calloc (1, _IO_BUFSIZ);
if (buf == NULL)
- return NULL;
+ {
+ free (new_f);
+ return NULL;
+ }
_IO_init (&new_f->fp._sf._sbf._f, 0);
_IO_JUMPS ((struct _IO_FILE_plus *) &new_f->fp._sf._sbf) = &_IO_mem_jumps;
_IO_str_init_static_internal (&new_f->fp._sf, buf, _IO_BUFSIZ, buf);
diff --git a/libio/wmemstream.c b/libio/wmemstream.c
index 65738d4..fd7fe44 100644
--- a/libio/wmemstream.c
+++ b/libio/wmemstream.c
@@ -85,8 +85,10 @@ open_wmemstream (bufloc, sizeloc)
buf = calloc (1, _IO_BUFSIZ);
if (buf == NULL)
- return NULL;
-
+ {
+ free (new_f);
+ return NULL;
+ }
_IO_no_init (&new_f->fp._sf._sbf._f, 0, 0, &new_f->wd, &_IO_wmem_jumps);
_IO_fwide (&new_f->fp._sf._sbf._f, 1);
_IO_wstr_init_static (&new_f->fp._sf._sbf._f, buf,
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 12 ++++++++++++
NEWS | 3 ++-
libio/memstream.c | 5 ++++-
libio/wmemstream.c | 6 ++++--
manual/string.texi | 2 +-
stdlib/isomac.c | 1 +
6 files changed, 24 insertions(+), 5 deletions(-)
hooks/post-receive
--
GNU C Library master sources