[asterisk-commits] mnicholson: branch 1.6.2 r269084 - in /branches/1.6.2: ./ apps/app_fax.c

[SVN commits to the Asterisk project]

Author: mnicholson
Date: Tue Jun  8 13:51:19 2010
New Revision: 269084

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

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/apps/app_fax.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.2/apps/app_fax.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/apps/app_fax.c?view=diff&rev=269084&r1=269083&r2=269084
==============================================================================
--- branches/1.6.2/apps/app_fax.c (original)
+++ branches/1.6.2/apps/app_fax.c Tue Jun  8 13:51:19 2010
@@ -227,8 +227,8 @@
 	
 	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);