[svn-commits] kmoore: trunk r402756 - in /trunk: ./ apps/app_celgenuserevent.c

[SVN commits to the Digium repositories]

Author: kmoore
Date: Tue Nov 12 10:34:31 2013
New Revision: 402756

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=402756
Log:
CELGenUserEvent: Fix error message from ast_json_pack

This prevents NULL from being passed into an ast_json_pack call when no
extra information is passed to the application whick prevents an error
message about NULL arguments from being generated.
........

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

Modified:
    trunk/   (props changed)
    trunk/apps/app_celgenuserevent.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-12-merged (original)
+++ branch-12-merged Tue Nov 12 10:34:31 2013
@@ -1,1 +1,1 @@
-/branches/12:1-398558,398560-398577,398579-399305,399307-401390,401392-402738
+/branches/12:1-398558,398560-398577,398579-399305,399307-401390,401392-402738,402755

Modified: trunk/apps/app_celgenuserevent.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_celgenuserevent.c?view=diff&rev=402756&r1=402755&r2=402756
==============================================================================
--- trunk/apps/app_celgenuserevent.c (original)
+++ trunk/apps/app_celgenuserevent.c Tue Nov 12 10:34:31 2013
@@ -77,7 +77,7 @@
 
 	blob = ast_json_pack("{s: s, s: {s: s}}",
 		"event", args.event,
-		"extra", "extra", args.extra);
+		"extra", "extra", S_OR(args.extra, ""));
 	if (!blob) {
 		return res;
 	}