From d1db1fd88474eddc8d955fbb8bce25aef67a2b19 Mon Sep 17 00:00:00 2001 From: eliel Date: Sun, 31 May 2009 01:48:47 +0000 Subject: 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) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@198440 f38db490-d61c-443f-a65b-d21fe96a405b --- res/res_timing_dahdi.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'res') diff --git a/res/res_timing_dahdi.c b/res/res_timing_dahdi.c index bc65bbdcf..ae95cf9cd 100644 --- a/res/res_timing_dahdi.c +++ b/res/res_timing_dahdi.c @@ -192,7 +192,11 @@ static int load_module(void) 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"); -- cgit v1.2.3