[svn-commits] file: trunk r431539 - in /trunk: ./ main/sorcery.c

[SVN commits to the Digium repositories]

Author: file
Date: Tue Feb  3 18:59:14 2015
New Revision: 431539

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=431539
Log:
sorcery: Don't try to load object types which haven't been defined.

The act of defining wizards for an object type in sorcery.conf will
create a minimal object type. This can cause a problem when a module
has multiple sorcery instances (which all get the wizards from sorcery.conf
applied) but the sorcery instances do not all contain full information
about the object types. Upon loading errors will occur stating that
the objects can not be created. This is confusing and is actually
perfectly fine.

This change makes it so that only object types which have been fully
defined will be loaded.

ASTERISK-24748 #close
Reported by: Joshua Colp
........

Merged revisions 431538 from http://svn.asterisk.org/svn/asterisk/branches/13

Modified:
    trunk/   (props changed)
    trunk/main/sorcery.c

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

Modified: trunk/main/sorcery.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/sorcery.c?view=diff&rev=431539&r1=431538&r2=431539
==============================================================================
--- trunk/main/sorcery.c (original)
+++ trunk/main/sorcery.c Tue Feb  3 18:59:14 2015
@@ -1247,6 +1247,10 @@
 {
 	struct ast_sorcery_object_type *type = obj;
 	struct sorcery_load_details *details = arg;
+
+	if (!type->type.item_alloc) {
+		return 0;
+	}
 
 	details->type = type->name;