From: Don Armstrong <don@donarmstrong.com>
Date: Thu, 3 Dec 2015 18:28:06 +0000 (-0600)
Subject: Imported Upstream version 0.52
X-Git-Tag: debian/0.52-2~18^2
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=1da936c8e812fd170203282a6d6f016ee528ee8f;p=unscd.git

Imported Upstream version 0.52
---

diff --git a/nscd.c b/nscd.c
index f1c4df8..93db75f 100644
--- a/nscd.c
+++ b/nscd.c
@@ -144,8 +144,9 @@ vda.linux@googlemail.com
  * 0.49   minor tweaks to messages
  * 0.50   add more files to watch for changes
  * 0.51   fix a case where we forget to refcount-- the cached entry
+ * 0.52   make free_refcounted_ureq() tolerant to pointers to NULLs
  */
-#define PROGRAM_VERSION "0.51"
+#define PROGRAM_VERSION "0.52"
 
 #define DEBUG_BUILD 1
 
@@ -1213,6 +1214,10 @@ static void free_refcounted_ureq(user_req **ureqp)
 {
 	user_req *ureq = *ureqp;
 
+	/* (when exactly can this happen?) */
+	if (ureq == NULL)
+		return;
+
 	if (!CACHED_ENTRY(ureq))
 		return;