GNU C Library master sources branch master updated. glibc-2.28.9000-477-g61595e3

schwab@sourceware.org schwab@sourceware.org
Wed Dec 19 10:46:00 GMT 2018


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  61595e3d36ded374f97961503e843a314b0203c2 (commit)
      from  bbb7dc8475b5c06b3e5d1dcf51a1ec6e045bfc6f (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=61595e3d36ded374f97961503e843a314b0203c2

commit 61595e3d36ded374f97961503e843a314b0203c2
Author: Andreas Schwab <schwab@suse.de>
Date:   Tue May 15 14:42:37 2018 +0200

    nscd: avoid assertion failure during persistent db check
    
    nscd should not abort when it finds inconsistencies in the persistent db.

diff --git a/ChangeLog b/ChangeLog
index 2ea7440..89ad526 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2018-12-19  Andreas Schwab  <schwab@suse.de>
+
+	* nscd/connections.c (check_use): Don't abort on invalid len.
+
 2018-12-18  Samuel Thibault  <samuel.thibault@ens-lyon.org>
 
 	* sysdeps/mach/hurd/fcntl.c (__libc_fcntl): Test against 64bit `cmd'
diff --git a/nscd/connections.c b/nscd/connections.c
index 47fbb99..9818200 100644
--- a/nscd/connections.c
+++ b/nscd/connections.c
@@ -304,7 +304,8 @@ static int
 check_use (const char *data, nscd_ssize_t first_free, uint8_t *usemap,
 	   enum usekey use, ref_t start, size_t len)
 {
-  assert (len >= 2);
+  if (len < 2)
+    return 0;
 
   if (start > first_free || start + len > first_free
       || (start & BLOCK_ALIGN_M1))

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

Summary of changes:
 ChangeLog          |    4 ++++
 nscd/connections.c |    3 ++-
 2 files changed, 6 insertions(+), 1 deletions(-)


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



More information about the Glibc-cvs mailing list