From: Todd C. Miller <Todd.Miller@courtesan.com>
Date: Sat, 7 May 2016 13:57:15 +0000 (-0600)
Subject: Fix memory leak in sudo_netgroup_lookup() in the non-error case.
X-Git-Tag: SUDO_1_8_17^2~79
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0568fa90cf081116543d01358dc510809f28979e;p=sudo

Fix memory leak in sudo_netgroup_lookup() in the non-error case.
Coverity CID 104572, 104573, 104574, 104575.
---

diff --git a/plugins/sudoers/ldap.c b/plugins/sudoers/ldap.c
index 91d53acc6..1c2091ac9 100644
--- a/plugins/sudoers/ldap.c
+++ b/plugins/sudoers/ldap.c
@@ -1407,6 +1407,7 @@ sudo_netgroup_lookup(LDAP *ld, struct passwd *pw,
     char *escaped_domain = NULL, *escaped_user = NULL;
     char *escaped_host = NULL, *escaped_shost = NULL, *filt = NULL;
     int filt_len, rc;
+    bool rval = false;
     debug_decl(sudo_netgroup_lookup, SUDOERS_DEBUG_LDAP);
 
     if (ldap_conf.timeout > 0) {
@@ -1533,13 +1534,15 @@ sudo_netgroup_lookup(LDAP *ld, struct passwd *pw,
 	ng = old_tail ? STAILQ_NEXT(old_tail, entries) : STAILQ_FIRST(netgroups);
 	if (ng != NULL) {
 	    if (!sudo_netgroup_lookup_nested(ld, base->val, tvp, netgroups, ng))
-		debug_return_bool(false);
+		goto done;
 	}
     }
-    free(filt);
-    debug_return_bool(true);
+    rval = true;
+    goto done;
+
 oom:
     sudo_warnx(U_("%s: %s"), __func__, U_("unable to allocate memory"));
+done:
     free(escaped_domain);
     free(escaped_user);
     free(escaped_host);
@@ -1547,7 +1550,7 @@ oom:
 	free(escaped_shost);
     free(filt);
     ldap_msgfree(result);
-    debug_return_bool(false);
+    debug_return_bool(rval);
 }
 
 /*