From 35de431cfda12cfdc6d94f9c5f11b6683aa3a979 Mon Sep 17 00:00:00 2001 From: mnicholson Date: Tue, 8 Jun 2010 18:51:19 +0000 Subject: Merged revisions 269083 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r269083 | mnicholson | 2010-06-08 13:50:45 -0500 (Tue, 08 Jun 2010) | 9 lines Don't pass null to manager_event() (closes issue #17087) Reported by: bklang Patches: app-fax-null-sprintf1.diff uploaded by mnicholson (license 96) Tested by: bklang ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@269084 f38db490-d61c-443f-a65b-d21fe96a405b --- apps/app_fax.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'apps') diff --git a/apps/app_fax.c b/apps/app_fax.c index 0594275ea..9efefc787 100644 --- a/apps/app_fax.c +++ b/apps/app_fax.c @@ -227,8 +227,8 @@ static void phase_e_handler(t30_state_t *f, void *user_data, int result) s->finished = 1; - local_ident = t30_get_tx_ident(f); - far_ident = t30_get_rx_ident(f); + local_ident = S_OR(t30_get_tx_ident(f), ""); + far_ident = S_OR(t30_get_rx_ident(f), ""); pbx_builtin_setvar_helper(s->chan, "FAXSTATUS", "SUCCESS"); pbx_builtin_setvar_helper(s->chan, "FAXERROR", NULL); pbx_builtin_setvar_helper(s->chan, "REMOTESTATIONID", far_ident); -- cgit v1.2.3