[asterisk-commits] mmichelson: branch 11 r377843 - in /branches/11: ./ res/res_clialiases.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Tue Dec 11 14:51:47 2012
New Revision: 377843

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=377843
Log:
Fix crash that can occur if CLI registration fails for an aliased command.

A recent memory leak fix in main/cli.c causes an ast_cli_entry's command
field to be freed and NULLed if ast_cli_register() fails. res_clialiases
was ignoring the return value of ast_cli_register() and was then passing
the NULL command off to a a hash function. This resulted in a crash.

The fix is not to ignore the erroneous return value. If ast_cli_register()
fails, then we do not continue trying to process the current alias.
........

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

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

Modified:
    branches/11/   (props changed)
    branches/11/res/res_clialiases.c

Propchange: branches/11/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Modified: branches/11/res/res_clialiases.c
URL: http://svnview.digium.com/svn/asterisk/branches/11/res/res_clialiases.c?view=diff&rev=377843&r1=377842&r2=377843
==============================================================================
--- branches/11/res/res_clialiases.c (original)
+++ branches/11/res/res_clialiases.c Tue Dec 11 14:51:47 2012
@@ -209,7 +209,10 @@
 			alias->cli_entry.command = alias->alias;
 			alias->cli_entry.usage = "Aliased CLI Command\n";
 
-			ast_cli_register(&alias->cli_entry);
+			if (ast_cli_register(&alias->cli_entry)) {
+				ao2_ref(alias, -1);
+				continue;
+			}
 			ao2_link(cli_aliases, alias);
 			ast_verb(2, "Aliased CLI command '%s' to '%s'\n", v1->name, v1->value);
 			ao2_ref(alias, -1);