nscd: avoid assertion failure during persistent db check

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

(cherry picked from commit 61595e3d36ded374f97961503e843a314b0203c2)

diff --git a/ChangeLog b/ChangeLog
index 8c5c162f569e816c03abf48cc70c13351862ec68..f855dbdc2043f64fc04b6dbe534d525bd5517138 100644 (file)
--- 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.
+
 2019-05-17  Wilco Dijkstra  <wdijkstr@arm.com>
 
        * malloc/malloc.c (MAX_TCACHE_COUNT): Increase to UINT16_MAX.

diff --git a/nscd/connections.c b/nscd/connections.c
index 47fbb9923aa2aac7480f15a823303862d3049363..98182007646a33d550d02e98187a7586ffaf7c5f 100644 (file)
--- 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))