[svn-commits] gtjoseph: branch 13 r424448 - in /branches/13: ./ main/sorcery.c

[SVN commits to the Digium repositories]

Author: gtjoseph
Date: Fri Oct  3 10:54:44 2014
New Revision: 424448

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=424448
Log:
sorcery: Prevent SEGV in sorcery_wizard_create when there's no create function

When you call ast_sorcery_create() you don't necessarily know which wizard is
going to be invoked.  If it happens to be a wizard like 'config' that doesn't
have a 'create' virtual function you get a segfault in the
sorcery_wizard_create callback.  This patch catches the null function pointer,
does an ast_assert, and logs an error.

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

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

Modified:
    branches/13/   (props changed)
    branches/13/main/sorcery.c

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

Modified: branches/13/main/sorcery.c
URL: http://svnview.digium.com/svn/asterisk/branches/13/main/sorcery.c?view=diff&rev=424448&r1=424447&r2=424448
==============================================================================
--- branches/13/main/sorcery.c (original)
+++ branches/13/main/sorcery.c Fri Oct  3 10:54:44 2014
@@ -1572,6 +1572,12 @@
 	const struct ast_sorcery_object_wizard *object_wizard = obj;
 	const struct sorcery_details *details = arg;
 
+	if (!object_wizard->wizard->create) {
+		ast_assert(0);
+		ast_log(LOG_ERROR, "Sorcery wizard '%s' doesn't contain a 'create' virtual function.\n",
+			object_wizard->wizard->name);
+		return 0;
+	}
 	return (!object_wizard->caching && !object_wizard->wizard->create(details->sorcery, object_wizard->data, details->obj)) ? CMP_MATCH | CMP_STOP : 0;
 }