From: Lukas Slebodnik <lslebodn@redhat.com>
Date: Sat, 21 Jun 2014 14:43:12 +0000 (+0200)
Subject: Avoid closing fd -1 in libkrad
X-Git-Tag: krb5-1.13-alpha1~56
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=315d1ef769d3e3e7cc17884623c1baaad680c26b;p=thirdparty%2Fkrb5.git

Avoid closing fd -1 in libkrad

If a krad_remote is released before its fd is set, we could close the
file descriptor -1, which is harmless but incorrect.  Check the fd in
remote_disconnect to avoid this.

[ghudson@mit.edu: clarified commit message, minor style change]
---

diff --git a/src/lib/krad/remote.c b/src/lib/krad/remote.c
index bea14299e3..795485f19d 100644
--- a/src/lib/krad/remote.c
+++ b/src/lib/krad/remote.c
@@ -144,7 +144,8 @@ request_start_timer(request *r, verto_ctx *vctx)
 static void
 remote_disconnect(krad_remote *rr)
 {
-    close(rr->fd);
+    if (rr->fd >= 0)
+        close(rr->fd);
     verto_del(rr->io);
     rr->fd = -1;
     rr->io = NULL;