kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-03 03:20:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

main/formats: Fix crash in ast_format_cmp during non-clean shutdown.

Browse Source 
* Update asterisk.h to reflect availability of ast_register_cleanup in 11.9.
* Use ast_register_cleanup for format_attr_shutdown.

(closes issue ASTERISK-23103)
Reported by: JoshE
........

Merged revisions 411310 from http://svn.asterisk.org/svn/asterisk/branches/11
........

Merged revisions 411311 from http://svn.asterisk.org/svn/asterisk/branches/12


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@411312 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Corey Farrell
2014-03-27 18:26:12 +00:00
parent a8629e53c1
commit 44409401ec
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/asterisk.h
View File

@@ -90,7 +90,7 @@ int ast_pbx_init(void); /*!< Provided by pbx.c */
int ast_register_atexit(void (*func)(void));
/*!
* \since 12
* \since 11.9
* \brief Register a function to be executed before Asterisk gracefully exits.
*
* If Asterisk is immediately shutdown (core stop now, or sending the TERM

2
main/format.c
View File

@@ -1149,7 +1149,7 @@ int ast_format_attr_init(void)
}
ast_cli_register_multiple(my_clis, ARRAY_LEN(my_clis));
ast_register_atexit(format_attr_shutdown);
ast_register_cleanup(format_attr_shutdown);
return 0;
}