diff options
author | Eliel C. Sardanons <eliels@gmail.com> | 2009-05-31 01:22:15 +0000 |
---|---|---|
committer | Eliel C. Sardanons <eliels@gmail.com> | 2009-05-31 01:22:15 +0000 |
commit | 0c99bc31cba3c2002889b97b0d9d6a999c760c18 (patch) | |
tree | e0a8f123450e50c410fd0e4a730c9da2c1568d4d /res/res_timing_dahdi.c | |
parent | 8580871fd4a2b8730c9576fb51857affb6d876d1 (diff) |
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: https://origsvn.digium.com/svn/asterisk/trunk@198437 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/res_timing_dahdi.c')
-rw-r--r-- | res/res_timing_dahdi.c | 6 |
1 files changed, 5 insertions, 1 deletions
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"); |