[svn-commits] coreyfarrell: trunk r411312 - in /trunk: ./ include/asterisk.h main/format.c

[SVN commits to the Digium repositories]

Author: coreyfarrell
Date: Thu Mar 27 13:26:12 2014
New Revision: 411312

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=411312
Log:
main/formats: Fix crash in ast_format_cmp during non-clean shutdown.

* 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

Modified:
    trunk/   (props changed)
    trunk/include/asterisk.h
    trunk/main/format.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-12-merged' - no diff available.

Modified: trunk/include/asterisk.h
URL: http://svnview.digium.com/svn/asterisk/trunk/include/asterisk.h?view=diff&rev=411312&r1=411311&r2=411312
==============================================================================
--- trunk/include/asterisk.h (original)
+++ trunk/include/asterisk.h Thu Mar 27 13:26:12 2014
@@ -90,7 +90,7 @@
 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

Modified: trunk/main/format.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/format.c?view=diff&rev=411312&r1=411311&r2=411312
==============================================================================
--- trunk/main/format.c (original)
+++ trunk/main/format.c Thu Mar 27 13:26:12 2014
@@ -1149,7 +1149,7 @@
 	}
 
 	ast_cli_register_multiple(my_clis, ARRAY_LEN(my_clis));
-	ast_register_atexit(format_attr_shutdown);
+	ast_register_cleanup(format_attr_shutdown);
 	return 0;
 }