From: Corey Farrell <git@cfware.com>
Date: Thu, 27 Sep 2018 10:33:22 +0000 (-0400)
Subject: astobj2: Fix shutdown order.
X-Git-Tag: 15.7.0-rc1~21^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=427c3e3152ebe80179eb24002e3e35fcb0c3ff92;p=thirdparty%2Fasterisk.git

astobj2: Fix shutdown order.

When REF_DEBUG and AO2_DEBUG are both enabled we closed the refs log
before we shutdown astobj2_container.  This caused the AO2_DEBUG
container registration container to be reported as a leak.

Change-Id: If9111c4c21c68064b22c546d5d7a41fac430430e
---

diff --git a/main/astobj2.c b/main/astobj2.c
index 63058e19e3..91ebc1e2c9 100644
--- a/main/astobj2.c
+++ b/main/astobj2.c
@@ -1193,8 +1193,11 @@ int astobj2_init(void)
 		}
 	}
 
+	ast_register_cleanup(astobj2_cleanup);
+
 	if (container_init() != 0) {
 		fclose(ref_log);
+		ref_log = NULL;
 		return -1;
 	}
 
@@ -1202,7 +1205,5 @@ int astobj2_init(void)
 	ast_cli_register_multiple(cli_astobj2, ARRAY_LEN(cli_astobj2));
 #endif	/* defined(AO2_DEBUG) */
 
-	ast_register_cleanup(astobj2_cleanup);
-
 	return 0;
 }