From 566446d77e06fa3651a14c9e2ef82ea686063b73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20=C3=96man?= Date: Wed, 10 Jun 2009 05:54:48 +0000 Subject: [PATCH] Fix a memory leak (Startup only) --- src/access.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/access.c b/src/access.c index dc62d24d..46d2a9cb 100644 --- a/src/access.c +++ b/src/access.c @@ -420,7 +420,8 @@ access_init(int createdefault) dtable_t *dt; htsmsg_t *r, *m; access_entry_t *ae; - + const char *s; + TAILQ_INIT(&access_entries); dt = dtable_create(&access_dtc, "accesscontrol", NULL); @@ -446,8 +447,10 @@ access_init(int createdefault) /* Load superuser account */ if((m = hts_settings_load("superuser")) != NULL) { - superuser_username = htsmsg_get_str(m, "username"); - superuser_password = htsmsg_get_str(m, "password"); - // Keep 'm' in memory + s = htsmsg_get_str(m, "username"); + superuser_username = s ? strdup(s) : NULL; + s = htsmsg_get_str(m, "password"); + superuser_password =s ? strdup(s) : NULL; + htsmsg_destroy(m); } }