[asterisk-commits] mmichelson: branch mmichelson/queue_bugbug r394603 - /team/mmichelson/queue_b...

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Wed Jul 17 14:46:45 2013
New Revision: 394603

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=394603
Log:
Fix crash observed on blond transfers.

Since blond transfers only consist of a single bridge, assuming
both would be non-NULL was a bad idea.


Modified:
    team/mmichelson/queue_bugbug/apps/app_queue.c

Modified: team/mmichelson/queue_bugbug/apps/app_queue.c
URL: http://svnview.digium.com/svn/asterisk/team/mmichelson/queue_bugbug/apps/app_queue.c?view=diff&rev=394603&r1=394602&r2=394603
==============================================================================
--- team/mmichelson/queue_bugbug/apps/app_queue.c (original)
+++ team/mmichelson/queue_bugbug/apps/app_queue.c Wed Jul 17 14:46:45 2013
@@ -5295,10 +5295,10 @@
 
 		ao2_lock(queue_data);
 		if (ast_strlen_zero(queue_data->bridge_uniqueid) ||
-				(strcmp(queue_data->bridge_uniqueid,
-						atxfer_msg->to_transferee.bridge_snapshot->uniqueid) &&
-				 strcmp(queue_data->bridge_uniqueid,
-					 atxfer_msg->to_transfer_target.bridge_snapshot->uniqueid))) {
+				((atxfer_msg->to_transferee.bridge_snapshot && strcmp(queue_data->bridge_uniqueid,
+						atxfer_msg->to_transferee.bridge_snapshot->uniqueid)) &&
+				 (atxfer_msg->to_transfer_target.bridge_snapshot && strcmp(queue_data->bridge_uniqueid,
+					 atxfer_msg->to_transfer_target.bridge_snapshot->uniqueid)))) {
 			ao2_unlock(queue_data);
 			return;
 		}