main/formats: Fix crash in ast_format_cmp during non-clean shutdown.
authorCorey Farrell <git@cfware.com>
Thu, 27 Mar 2014 18:26:12 +0000 (18:26 +0000)
committerCorey Farrell <git@cfware.com>
Thu, 27 Mar 2014 18:26:12 +0000 (18:26 +0000)
* 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

include/asterisk.h
main/format.c

index 35628d2..ee1a9c3 100644 (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
index 5791410..9c7b591 100644 (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;
 }