[PATCH] nscd: avoid assertion failure during persistent db check

Andreas Schwab schwab@suse.de
Tue May 15 13:24:00 GMT 2018


nscd should not abort when it finds inconsistencies in the persistent db.

	* nscd/connections.c (check_use): Don't abort on invalid len.
---
 nscd/connections.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nscd/connections.c b/nscd/connections.c
index 5f91985859..d2ac3147a0 100644
--- a/nscd/connections.c
+++ b/nscd/connections.c
@@ -327,7 +327,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))
-- 
2.17.0


-- 
Andreas Schwab, SUSE Labs, schwab@suse.de
GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE  1748 E4D4 88E3 0EEA B9D7
"And now for something completely different."



More information about the Libc-alpha mailing list