[asterisk-commits] elguero: trunk r409627 - in /trunk: ./ funcs/func_audiohookinherit.c

[SVN commits to the Asterisk project]

Author: elguero
Date: Tue Mar  4 13:34:52 2014
New Revision: 409627

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=409627
Log:
func_audiohookinheritance: Check If A Channel Was Specified

This patch prevents a crash when using the function audiohookinheritance without
setting the channel.

(closes issue ASTERISK-23104)
Reported by: Joel Vandal
Tested by: Joel Vandal
Patches:
    asterisk-23104_audiohook_inherit_no_channel-11.diff
                                     uploaded by Michael L. Young (license 5026)

Review: https://reviewboard.asterisk.org/r/3272/
........

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

Merged revisions 409625 from http://svn.asterisk.org/svn/asterisk/branches/11
........

Merged revisions 409626 from http://svn.asterisk.org/svn/asterisk/branches/12

Modified:
    trunk/   (props changed)
    trunk/funcs/func_audiohookinherit.c

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

Modified: trunk/funcs/func_audiohookinherit.c
URL: http://svnview.digium.com/svn/asterisk/trunk/funcs/func_audiohookinherit.c?view=diff&rev=409627&r1=409626&r2=409627
==============================================================================
--- trunk/funcs/func_audiohookinherit.c (original)
+++ trunk/funcs/func_audiohookinherit.c Tue Mar  4 13:34:52 2014
@@ -228,6 +228,11 @@
 		return -1;
 	}
 
+	if (!chan) {
+		ast_log(LOG_WARNING, "No channel was provided to INHERITANCE function.\n");
+		return -1;
+	}
+
 	allow = ast_true(value);
 
 	/* Step 2: retrieve or set up datastore */