[Asterisk-code-review] test config: Fix failure and segfault when config hook is ru... (asterisk[master])

[Joshua Colp]

Joshua Colp has submitted this change and it was merged. ( https://gerrit.asterisk.org/6874 )

Change subject: test_config: Fix failure and segfault when config_hook is run twice.
......................................................................

test_config: Fix failure and segfault when config_hook is run twice.

On second run the config_hook test was unexpectedly failing to load
test_config.conf because it was still unmodified since the last load.
This is fixed by not passing CONFIG_FLAG_FILEUNCHANGED for the initial
loads, only using it when we are tested that a reload of unmodified
files do not initiate the hook.

ASTERISK-25960

Change-Id: Ifd679509a23ed163e5cc647490bf7df4ae3cd856
---
M tests/test_config.c
1 file changed, 3 insertions(+), 2 deletions(-)

Approvals:
  Joshua Colp: Looks good to me, but someone else must approve; Approved for Submit
  Richard Mudgett: Looks good to me, approved



diff --git a/tests/test_config.c b/tests/test_config.c
index 8675cb8..d74726a 100644
--- a/tests/test_config.c
+++ b/tests/test_config.c
@@ -957,7 +957,8 @@
 {
 	enum ast_test_result_state res = AST_TEST_FAIL;
 	enum config_hook_flags hook_flags = { 0, };
-	struct ast_flags config_flags = { CONFIG_FLAG_FILEUNCHANGED };
+	struct ast_flags config_flags = { 0 };
+	struct ast_flags reload_flags = { CONFIG_FLAG_FILEUNCHANGED };
 	struct ast_config *cfg;
 
 	switch (cmd) {
@@ -1025,7 +1026,7 @@
 	 * Hook should not run
 	 */
 	hook_run = 0;
-	cfg = ast_config_load(CONFIG_FILE, config_flags);
+	cfg = ast_config_load(CONFIG_FILE, reload_flags);
 	/* Only destroy this cfg conditionally. Otherwise a crash happens. */
 	if (cfg != CONFIG_STATUS_FILEUNCHANGED) {
 		ast_config_destroy(cfg);

-- 
To view, visit https://gerrit.asterisk.org/6874
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifd679509a23ed163e5cc647490bf7df4ae3cd856
Gerrit-Change-Number: 6874
Gerrit-PatchSet: 1
Gerrit-Owner: Corey Farrell <git at cfware.com>
Gerrit-Reviewer: Jenkins2
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Richard Mudgett <rmudgett at digium.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20171024/fe0d238f/attachment.html>