[svn-commits] mmichelson: branch 1.4 r166568 - /branches/1.4/main/channel.c

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Tue Dec 23 09:16:26 2008
New Revision: 166568

URL: http://svn.digium.com/view/asterisk?view=rev&rev=166568
Log:
Fix a crash resulting from a datastore with inheritance but no duplicate callback

The fix for this is to simply set the newly created datastore's data pointer
to NULL if it is inherited but has no duplicate callback.

(closes issue #14113)
Reported by: francesco_r
Patches:
      14113.patch uploaded by putnopvut (license 60)
Tested by: francesco_r


Modified:
    branches/1.4/main/channel.c

Modified: branches/1.4/main/channel.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/channel.c?view=diff&rev=166568&r1=166567&r2=166568
==============================================================================
--- branches/1.4/main/channel.c (original)
+++ branches/1.4/main/channel.c Tue Dec 23 09:16:26 2008
@@ -1359,7 +1359,7 @@
 		if (datastore->inheritance > 0) {
 			datastore2 = ast_channel_datastore_alloc(datastore->info, datastore->uid);
 			if (datastore2) {
-				datastore2->data = datastore->info->duplicate(datastore->data);
+				datastore2->data = datastore->info->duplicate ? datastore->info->duplicate(datastore->data) : NULL;
 				datastore2->inheritance = datastore->inheritance == DATASTORE_INHERIT_FOREVER ? DATASTORE_INHERIT_FOREVER : datastore->inheritance - 1;
 				AST_LIST_INSERT_TAIL(&to->datastores, datastore2, entry);
 			}