[asterisk-commits] mjordan: trunk r389990 - /trunk/res/res_fax.c

[SVN commits to the Asterisk project]

Author: mjordan
Date: Tue May 28 22:22:04 2013
New Revision: 389990

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=389990
Log:
Pack the right number of items into the status and receive fax blobs

The code was still attempting to pack an additional item into the blobs
that didn't exist. Crashes ensued. This patch modifies the publishing of
these messages so that the correct number of items are packed in the JSON.

Modified:
    trunk/res/res_fax.c

Modified: trunk/res/res_fax.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_fax.c?view=diff&rev=389990&r1=389989&r2=389990
==============================================================================
--- trunk/res/res_fax.c (original)
+++ trunk/res/res_fax.c Tue May 28 22:22:04 2013
@@ -1184,7 +1184,7 @@
 		return -1;
 	}
 
-	json_object = ast_json_pack("{s: s, s: s, s: s, s: s, s: s, s: o}",
+	json_object = ast_json_pack("{s: s, s: s, s: s, s: s, s: o}",
 			"type", "status",
 			"operation", (details->caps & AST_FAX_TECH_GATEWAY) ? "gateway" : (details->caps & AST_FAX_TECH_RECEIVE) ? "receive" : "send",
 			"status", status,
@@ -1777,7 +1777,7 @@
 	{
 		SCOPED_CHANNELLOCK(lock, chan);
 
-		json_object = ast_json_pack("s: s, s: s, s: s, s: s, s: s, s: s, s: s, s: o",
+		json_object = ast_json_pack("s: s, s: s, s: s, s: s, s: s, s: s, s: o",
 				"type", "receive"
 				"remote_station_id", S_OR(pbx_builtin_getvar_helper(chan, "REMOTESTATIONID"), ""),
 				"local_station_id", S_OR(pbx_builtin_getvar_helper(chan, "LOCALSTATIONID"), ""),