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.17-576-g9ce3b2c
- From: aj at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 29 Apr 2013 19:04:57 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.17-576-g9ce3b2c
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 9ce3b2cbd245abedc6cff147a1b91566e340edb1 (commit)
via b1a36ceb3bb0c8de45fc2024e57529e02ee3adef (commit)
from 7e7b6f36a99c2a8eb2acbd01237ea9a5fd9f0433 (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=9ce3b2cbd245abedc6cff147a1b91566e340edb1
commit 9ce3b2cbd245abedc6cff147a1b91566e340edb1
Author: Andreas Jaeger <aj@suse.de>
Date: Mon Apr 29 21:02:16 2013 +0200
BZ#15380: Fix initstate error return
[BZ #15380]
* stdlib/random.c (__initstate): Return NULL if
__initstate fails.
diff --git a/ChangeLog b/ChangeLog
index bf4500a..ad58947 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2013-04-29 Andreas Jaeger <aj@suse.de>
+ [BZ #15380]
+ * stdlib/random.c (__initstate): Return NULL if
+ __initstate fails.
+
[BZ# 15086]
* resolv/res_debug.c (p_option): Handle RES_NOALIASES,
RES_KEEPTSIG, RES_BLAST, RES_NOIP6DOTINT, RES_SNGLKUP,
diff --git a/NEWS b/NEWS
index 0a8e622..e0d3d74 100644
--- a/NEWS
+++ b/NEWS
@@ -15,7 +15,7 @@ Version 2.18
15006, 15007, 15020, 15023, 15036, 15054, 15055, 15062, 15078, 15086,
15160, 15214, 15221, 15232, 15234, 15283, 15285, 15287, 15304, 15305,
15307, 15309, 15327, 15330, 15335, 15336, 15337, 15342, 15346, 15361,
- 15366, 15394, 15405, 15406, 15409.
+ 15366, 15380, 15394, 15405, 15406, 15409.
* CVE-2013-0242 Buffer overrun in regexp matcher has been fixed (Bugzilla
#15078).
diff --git a/stdlib/random.c b/stdlib/random.c
index 3ed610d..967dec3 100644
--- a/stdlib/random.c
+++ b/stdlib/random.c
@@ -234,16 +234,17 @@ __initstate (seed, arg_state, n)
size_t n;
{
int32_t *ostate;
+ int ret;
__libc_lock_lock (lock);
ostate = &unsafe_state.state[-1];
- __initstate_r (seed, arg_state, n, &unsafe_state);
+ ret = __initstate_r (seed, arg_state, n, &unsafe_state);
__libc_lock_unlock (lock);
- return (char *) ostate;
+ return ret == -1 ? NULL : (char *) ostate;
}
weak_alias (__initstate, initstate)
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=b1a36ceb3bb0c8de45fc2024e57529e02ee3adef
commit b1a36ceb3bb0c8de45fc2024e57529e02ee3adef
Author: Andreas Jaeger <aj@suse.de>
Date: Mon Apr 29 21:00:57 2013 +0200
BZ#15086: Fix res_debug printing of options
[BZ# 15086]
* resolv/res_debug.c (p_option): Handle RES_NOALIASES,
RES_KEEPTSIG, RES_BLAST, RES_NOIP6DOTINT, RES_SNGLKUP,
RES_SNGLKUPREOP.
diff --git a/ChangeLog b/ChangeLog
index 29e3c25..bf4500a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2013-04-29 Andreas Jaeger <aj@suse.de>
+
+ [BZ# 15086]
+ * resolv/res_debug.c (p_option): Handle RES_NOALIASES,
+ RES_KEEPTSIG, RES_BLAST, RES_NOIP6DOTINT, RES_SNGLKUP,
+ RES_SNGLKUPREOP.
+
2013-04-29 Adhemerval Zanella <azanella@linux.vnet.ibm.com>
* sysdeps/powerpc/fpu/libm-test-ulps: Update.
diff --git a/NEWS b/NEWS
index cdc0f3c..0a8e622 100644
--- a/NEWS
+++ b/NEWS
@@ -12,10 +12,10 @@ Version 2.18
10060, 10062, 10357, 11120, 11561, 12723, 13550, 13889, 13951, 13988,
14142, 14176, 14200, 14280, 14293, 14317, 14327, 14478, 14496, 14686,
14812, 14888, 14920, 14964, 14981, 14982, 14985, 14994, 14996, 15003,
- 15006, 15007, 15020, 15023, 15036, 15054, 15055, 15062, 15078, 15160,
- 15214, 15221, 15232, 15234, 15283, 15285, 15287, 15304, 15305, 15307,
- 15309, 15327, 15330, 15335, 15336, 15337, 15342, 15346, 15361, 15366,
- 15394, 15405, 15406, 15409.
+ 15006, 15007, 15020, 15023, 15036, 15054, 15055, 15062, 15078, 15086,
+ 15160, 15214, 15221, 15232, 15234, 15283, 15285, 15287, 15304, 15305,
+ 15307, 15309, 15327, 15330, 15335, 15336, 15337, 15342, 15346, 15361,
+ 15366, 15394, 15405, 15406, 15409.
* CVE-2013-0242 Buffer overrun in regexp matcher has been fixed (Bugzilla
#15078).
diff --git a/resolv/res_debug.c b/resolv/res_debug.c
index 3daa44e..c064d0c 100644
--- a/resolv/res_debug.c
+++ b/resolv/res_debug.c
@@ -582,11 +582,17 @@ p_option(u_long option) {
case RES_DNSRCH: return "dnsrch";
case RES_INSECURE1: return "insecure1";
case RES_INSECURE2: return "insecure2";
+ case RES_NOALIASES: return "noaliases";
case RES_USE_INET6: return "inet6";
case RES_ROTATE: return "rotate";
case RES_NOCHECKNAME: return "no-check-names";
+ case RES_KEEPTSIG: return "keeptsig(unimpl)";
+ case RES_BLAST: return "blast";
case RES_USEBSTRING: return "ip6-bytstring";
+ case RES_NOIP6DOTINT: return "no-ip6-dotint";
case RES_USE_EDNS0: return "edns0";
+ case RES_SNGLKUP: return "single-request";
+ case RES_SNGLKUPREOP: return "single-request-reopen";
case RES_USE_DNSSEC: return "dnssec";
case RES_NOTLDQUERY: return "no-tld-query";
/* XXX nonreentrant */
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 11 +++++++++++
NEWS | 8 ++++----
resolv/res_debug.c | 6 ++++++
stdlib/random.c | 5 +++--
4 files changed, 24 insertions(+), 6 deletions(-)
hooks/post-receive
--
GNU C Library master sources