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 0594275eab8b5bf1444a6e680df5096cd9312038..9efefc787ad34e697488e0a87a8aff50e8494d50 100644 (file)
--- 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);