kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "test_config: Fix failure and segfault when config_hook is run twice." into 13

Browse Source
This commit is contained in:
Jenkins2
2017-10-24 13:42:28 -05:00
committed by Gerrit Code Review
parent e7d8b4ebe7 6cec3149be
commit 529e8e2afa
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/test_config.c
View File

@@ -959,7 +959,8 @@ AST_TEST_DEFINE(config_hook)
{
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) {
@@ -1027,7 +1028,7 @@ AST_TEST_DEFINE(config_hook)
* 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);