Asterisk Guru

AsteriskGuru Archives
Mailing List Archives

FAQ

Memberlist

Usergroups

Profile

[svn-commits] eliel: branch 1.6.1 r198441 - in /branches/1.6

AsteriskGuru Archives Forum Index -> Asterisk-CVS

View previous topic :: View next topic

Author

Message

svn-commits at lists.digi
Guest

Posted: Sun May 31, 2009 1:02 am Post subject: [svn-commits] eliel: branch 1.6.1 r198441 - in /branches/1.6

Author: eliel Date: Sat May 30 20:58:53 2009 New Revision: 198441 URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=198441 Log: Merged revisions 198437 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r198437 \| eliel \| 2009-05-30 21:22:15 -0400 (Sat, 30 May 2009) \| 11 lines Avoid a crash when res_timing_dahdi is unloaded but wasn't properly loaded. if dahdi_test_timer() fails, timing_funcs_handle remains NULL causing a crash when calling ast_unregister_timing_interface() with a NULL pointer. (closes issue #15234) Reported by: eliel Patches: timing_dahdi1.diff uploaded by eliel (license 64) ........ Modified: branches/1.6.1/ (props changed) branches/1.6.1/res/res_timing_dahdi.c Propchange: branches/1.6.1/ ------------------------------------------------------------------------------ Binary property 'trunk-merged' - no diff available. Modified: branches/1.6.1/res/res_timing_dahdi.c URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/res/res_timing_dahdi.c?view=diff&rev=198441&r1=198440&r2=198441 ============================================================================== --- branches/1.6.1/res/res_timing_dahdi.c (original) +++ branches/1.6.1/res/res_timing_dahdi.c Sat May 30 20:58:53 2009 @@ -192,7 +192,11 @@ static int unload_module(void) { - return ast_unregister_timing_interface(timing_funcs_handle); + if (timing_funcs_handle) { + return ast_unregister_timing_interface(timing_funcs_handle); + } + + return 0; } AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "DAHDI Timing Interface"); _______________________________________________ --Bandwidth and Colocation Provided by http://www.api-digital.com-- svn-commits mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/svn-commits

Display posts from previous:

AsteriskGuru Archives Forum Index -> Asterisk-CVS	All times are GMT
Page 1 of 1

You cannot post new topics in this forum
You cannot reply to topics in this forum
You cannot edit your posts in this forum
You cannot delete your posts in this forum
You cannot vote in polls in this forum