From: Guillem Jover <guillem@hadrons.org>
Date: Sun, 16 Aug 2020 19:58:04 +0000 (+0200)
Subject: funopen: Fix memory leak in funopen_close() when closefn is NULL
X-Git-Tag: 0.11.0~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cfeafeabad1d415e55afb0bdc0c7b2244b4bac10;p=thirdparty%2Flibbsd.git

funopen: Fix memory leak in funopen_close() when closefn is NULL

We need to free the cookiewrap even when the closefn method is NULL.

Warned-by: gcc ASAN
---

diff --git a/src/funopen.c b/src/funopen.c
index 1e05c7e..1d908bc 100644
--- a/src/funopen.c
+++ b/src/funopen.c
@@ -87,10 +87,10 @@ funopen_close(void *cookie)
 	struct funopen_cookie *cookiewrap = cookie;
 	int rc;
 
-	if (cookiewrap->closefn == NULL)
-		return 0;
-
-	rc = cookiewrap->closefn(cookiewrap->orig_cookie);
+	if (cookiewrap->closefn)
+		rc = cookiewrap->closefn(cookiewrap->orig_cookie);
+	else
+		rc = 0;
 
 	free(cookiewrap);