diff options
| author | George Joseph <george.joseph@fairview5.com> | 2014-10-14 20:48:06 +0000 |
|---|---|---|
| committer | George Joseph <george.joseph@fairview5.com> | 2014-10-14 20:48:06 +0000 |
| commit | 104fca50019a432886bfe79615b88122547d9f16 (patch) | |
| tree | 4b88d7e4d5d2b00f45aa841da2a954ccb9e2ada7 /main/config.c | |
| parent | 87b5006ff06dd4a719dca96199e065437f31475d (diff) | |
config: Fix SEGV in unit test with MALLOC_DEBUG
With MALLOC_DEBUG the /main/config config_basic_ops test was causing a
SEGV while doing an ast_category_delete in an ast_category_browse loop.
Apparently this never worked but was also never tested. I removed the
test, added 2 notes to config.h indicating that it's not supported and
added a few lines of code to ast_category_delete to prevent the SEGV
should someone attempt it in the future.
Tested-by: George Joseph
Review: https://reviewboard.asterisk.org/r/4078/
........
Merged revisions 425525 from http://svn.asterisk.org/svn/asterisk/branches/12
........
Merged revisions 425526 from http://svn.asterisk.org/svn/asterisk/branches/13
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@425527 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/config.c')
| -rw-r--r-- | main/config.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/main/config.c b/main/config.c index 7009e7d08..7e6a4d1c1 100644 --- a/main/config.c +++ b/main/config.c @@ -1336,6 +1336,10 @@ struct ast_category *ast_category_delete(struct ast_config *config, prev = category->prev; + if (config->last_browse == category) { + config->last_browse = prev; + } + ast_category_destroy(category); return prev; |