[asterisk-commits] kmoore: branch 12 r402755 - /branches/12/apps/app_celgenuserevent.c

[SVN commits to the Asterisk project]

Author: kmoore
Date: Tue Nov 12 10:33:24 2013
New Revision: 402755

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=402755
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.

Modified:
    branches/12/apps/app_celgenuserevent.c

Modified: branches/12/apps/app_celgenuserevent.c
URL: http://svnview.digium.com/svn/asterisk/branches/12/apps/app_celgenuserevent.c?view=diff&rev=402755&r1=402754&r2=402755
==============================================================================
--- branches/12/apps/app_celgenuserevent.c (original)
+++ branches/12/apps/app_celgenuserevent.c Tue Nov 12 10:33:24 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;
 	}