GNU C Library master sources branch master updated. glibc-2.22-465-g0062ace

sthibaul@sourceware.org sthibaul@sourceware.org
Tue Oct 27 12:33:00 GMT 2015


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  0062ace2292effc4135c15ea99b1931fea5e0203 (commit)
      from  7a4cb4ad1130e43e1256f85cea38a3227320f944 (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=0062ace2292effc4135c15ea99b1931fea5e0203

commit 0062ace2292effc4135c15ea99b1931fea5e0203
Author: Ludovic Courtès <ludo@gnu.org>
Date:   Tue Oct 27 13:33:26 2015 +0100

    Gracefully handle incompatible locale data
    
    * locale/loadlocale.c (_nl_intern_locale_data): Change assertion
    on CNT to a conditional jump to 'puntdata'.

diff --git a/ChangeLog b/ChangeLog
index 4ce7a92..29ec912 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-10-27  Ludovic Courtès  <ludo@gnu.org>
+
+	* locale/loadlocale.c (_nl_intern_locale_data): Change assertion
+	on CNT to a conditional jump to 'puntdata'.
+
 2015-10-27  Joseph Myers  <joseph@codesourcery.com>
 
 	* configure.ac (libc_cv_gcc___thread): Remove configure test.
diff --git a/locale/loadlocale.c b/locale/loadlocale.c
index fdba6e9..dcbb833 100644
--- a/locale/loadlocale.c
+++ b/locale/loadlocale.c
@@ -121,9 +121,10 @@ _nl_intern_locale_data (int category, const void *data, size_t datasize)
       switch (category)
 	{
 #define CATTEST(cat) \
-	case LC_##cat:							      \
-	  assert (cnt < (sizeof (_nl_value_type_LC_##cat)		      \
-			 / sizeof (_nl_value_type_LC_##cat[0])));	      \
+	case LC_##cat:						\
+	  if (cnt >= (sizeof (_nl_value_type_LC_##cat)		\
+		      / sizeof (_nl_value_type_LC_##cat[0])))	\
+	    goto puntdata;					\
 	  break
 	  CATTEST (NUMERIC);
 	  CATTEST (TIME);

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog           |    5 +++++
 locale/loadlocale.c |    7 ++++---
 2 files changed, 9 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources



More information about the Glibc-cvs mailing list