Skip to content
Snippets Groups Projects
Commit ee111186 authored by Matthew Jordan's avatar Matthew Jordan
Browse files

Fix crash in unloading of res_adsi module

When res_adsi is unloaded, it removes the ADSI functions that it previously installed
by passing a NULL adsi_funcs pointer to ast_adsi_install_funcs.  This function was not
checking whether or not the adsi_funcs pointer passed in was NULL before dereferencing
it to check whether or not the version of the functions matches what the core was
expecting it.

This patch makes it so that the version is only checked if a potentially valid adsi_funcs
pointer was passed in.  Passing in NULL removes the installed functions, bypassing the
version check.
........

Merged revisions 369390 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 369391 from http://svn.asterisk.org/svn/asterisk/branches/10


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@369392 65c4cc65-6c06-0410-ace0-fbb531ad65f3
parent 5d31fb2d
No related branches found
No related tags found
No related merge requests found
...@@ -339,7 +339,7 @@ int ast_adsi_input_format(unsigned char *buf, int num, int dir, int wrap, char * ...@@ -339,7 +339,7 @@ int ast_adsi_input_format(unsigned char *buf, int num, int dir, int wrap, char *
void ast_adsi_install_funcs(const struct adsi_funcs *funcs) void ast_adsi_install_funcs(const struct adsi_funcs *funcs)
{ {
if (funcs->version < current_adsi_version) { if (funcs && funcs->version < current_adsi_version) {
ast_log(LOG_WARNING, "Cannot install ADSI function pointers due to version mismatch." ast_log(LOG_WARNING, "Cannot install ADSI function pointers due to version mismatch."
"Ours: %u, Theirs: %u\n", current_adsi_version, funcs->version); "Ours: %u, Theirs: %u\n", current_adsi_version, funcs->version);
return; return;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment