diff options
| author | Kinsey Moore <kmoore@digium.com> | 2013-11-12 16:34:31 +0000 |
|---|---|---|
| committer | Kinsey Moore <kmoore@digium.com> | 2013-11-12 16:34:31 +0000 |
| commit | 4f61528fbabbaf08886489ae6d93efb5c75e4dfb (patch) | |
| tree | 900c0c3bcc504ca44d7967ab26b6a93b2da20a88 /apps/app_celgenuserevent.c | |
| parent | 5701c51bb6d9ca3c928162b871bda993dc1b4cb3 (diff) | |
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 which prevents an error
message about NULL arguments from being generated.
........
Merged revisions 402755 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@402756 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_celgenuserevent.c')
| -rw-r--r-- | apps/app_celgenuserevent.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/app_celgenuserevent.c b/apps/app_celgenuserevent.c index 25065dccb..871724679 100644 --- a/apps/app_celgenuserevent.c +++ b/apps/app_celgenuserevent.c @@ -77,7 +77,7 @@ static int celgenuserevent_exec(struct ast_channel *chan, const char *data) 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; } |