From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Wed, 6 Nov 2019 16:59:51 +0000 (-0600)
Subject: Fix invalid check
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=574c537eff44a534972d83a51374d0671cc8cae9;p=thirdparty%2Ffreeradius-server.git

Fix invalid check
---

diff --git a/src/modules/proto_dhcpv4/dhcpclient.c b/src/modules/proto_dhcpv4/dhcpclient.c
index e2d84e45538..67d2545d185 100644
--- a/src/modules/proto_dhcpv4/dhcpclient.c
+++ b/src/modules/proto_dhcpv4/dhcpclient.c
@@ -172,7 +172,7 @@ static RADIUS_PACKET *request_init(char const *filename)
 	if (fr_pair_list_afrom_file(request, dict_dhcpv4, &request->vps, fp, &filedone) < 0) {
 		fr_perror("dhcpclient");
 		fr_radius_packet_free(&request);
-		if (fp != stdin) fclose(fp);
+		if (fp && (fp != stdin)) fclose(fp);
 		return NULL;
 	}
 
@@ -191,7 +191,7 @@ static RADIUS_PACKET *request_init(char const *filename)
 			if (fr_value_box_from_str(vp, &vp->data, &type, NULL, vp->xlat, -1, '\0', false) < 0) {
 				fr_perror("dhcpclient");
 				fr_radius_packet_free(&request);
-				if (fp != stdin) fclose(fp);
+				if (fp && (fp != stdin)) fclose(fp);
 				return NULL;
 			}
 			vp->type = VT_DATA;
@@ -228,7 +228,7 @@ static RADIUS_PACKET *request_init(char const *filename)
 
 	} /* loop over the VP's we read in */
 
-	if (fp != stdin) fclose(fp);
+	if (fp && (fp != stdin)) fclose(fp);
 
 	/*
 	 *	And we're done.