summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--nis/nis_callback.c3
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index f0555f09e7..ff66ed6e75 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-25  Ulrich Drepper  <drepper@redhat.com>
+
+	* nis/nis_callback.c (__nis_create_callback): Always call xdr_free
+	for cleanup when cb!=NULL [Coverity CID 233].
+
 2006-05-24  Ulrich Drepper  <drepper@redhat.com>
 
 	[BZ #2693]
diff --git a/nis/nis_callback.c b/nis/nis_callback.c
index 7c76f99b6b..e0acd9683a 100644
--- a/nis/nis_callback.c
+++ b/nis/nis_callback.c
@@ -360,8 +360,7 @@ __nis_create_callback (int (*callback) (const_nis_name, const nis_object *,
     {
       if (cb->xprt)
 	svc_destroy (cb->xprt);
-      if (cb->serv)
-	xdr_free ((xdrproc_t) _xdr_nis_server, (char *) cb->serv);
+      xdr_free ((xdrproc_t) _xdr_nis_server, (char *) cb->serv);
       free (cb);
     }
   if (!nomsg)