From: Howard Chu <hyc@openldap.org>
Date: Sat, 15 Dec 2001 13:43:49 +0000 (+0000)
Subject: Added atexit handler to free global_opts->ldo_defludp.
X-Git-Tag: LDBM_PRE_GIANT_RWLOCK~646
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=320d6742b736360a803b3fb99fc37d956c971171;p=openldap

Added atexit handler to free global_opts->ldo_defludp.
---

diff --git a/libraries/libldap/init.c b/libraries/libldap/init.c
index e05ade2d4c..080cd336d0 100644
--- a/libraries/libldap/init.c
+++ b/libraries/libldap/init.c
@@ -364,6 +364,17 @@ static void openldap_ldap_init_w_env(
 	}
 }
 
+static void
+ldap_int_destroy_global_options()
+{
+	struct ldapoptions *gopts = LDAP_INT_GLOBAL_OPT();
+
+	if ( gopts->ldo_defludp ) {
+		ldap_free_urllist( gopts->ldo_defludp );
+		gopts->ldo_defludp = NULL;
+	}
+}
+
 /* 
  * Initialize the global options structure with default values.
  */
@@ -382,11 +393,11 @@ void ldap_int_initialize_global_options( struct ldapoptions *gopts, int *dbglvl
 	gopts->ldo_tm_api = (struct timeval *)NULL;
 	gopts->ldo_tm_net = (struct timeval *)NULL;
 
-	/* ldo_defludp is leaked, we should have an at_exit() handler
-	 * to free this and whatever else needs to cleaned up. 
+	/* ldo_defludp wll be freed by the atexit() handler
 	 */
 	ldap_url_parselist(&gopts->ldo_defludp, "ldap://localhost/");
 	gopts->ldo_defport = LDAP_PORT;
+	atexit(ldap_int_destroy_global_options);
 
 	gopts->ldo_refhoplimit = LDAP_DEFAULT_REFHOPLIMIT;
 	gopts->ldo_rebind_proc = NULL;