From: Matthew Nicholson <mnicholson@digium.com>
Date: Tue, 8 Jun 2010 18:51:19 +0000 (+0000)
Subject: Merged revisions 269083 via svnmerge from
X-Git-Tag: 1.6.2.10-rc1~55
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54eb5a56f289ac5f0e32c5b067728e49278aa0e9;p=thirdparty%2Fasterisk.git

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: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@269084 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_fax.c b/apps/app_fax.c
index 0594275eab..9efefc787a 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);