[svn-commits] mnicholson: trunk r298055 - in /trunk: ./ res/res_fax.c

[SVN commits to the Digium repositories]

Author: mnicholson
Date: Fri Dec 10 10:53:43 2010
New Revision: 298055

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=298055
Log:
Merged revisions 298054 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r298054 | mnicholson | 2010-12-10 10:52:11 -0600 (Fri, 10 Dec 2010) | 2 lines
  
  Prevent a memcpy overlap in GENERIC_FAX_EXEC_SET_VARS
........

Modified:
    trunk/   (props changed)
    trunk/res/res_fax.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/res/res_fax.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_fax.c?view=diff&rev=298055&r1=298054&r2=298055
==============================================================================
--- trunk/res/res_fax.c (original)
+++ trunk/res/res_fax.c Fri Dec 10 10:53:43 2010
@@ -928,9 +928,12 @@
 
 #define GENERIC_FAX_EXEC_SET_VARS(fax, chan, errorstr, reason) \
 	do {	\
-		ast_string_field_set(fax->details, result, S_OR(fax->details->result, "FAILED")); \
-		ast_string_field_set(fax->details, resultstr, S_OR(fax->details->resultstr, reason)); \
-		ast_string_field_set(fax->details, error, S_OR(fax->details->error, errorstr)); \
+		if (ast_strlen_zero(fax->details->result)) \
+			ast_string_field_set(fax->details, result, "FAILED"); \
+		if (ast_strlen_zero(fax->details->resultstr)) \
+			ast_string_field_set(fax->details, resultstr, reason); \
+		if (ast_strlen_zero(fax->details->error)) \
+			ast_string_field_set(fax->details, error, errorstr); \
 		set_channel_variables(chan, fax->details); \
 	} while (0)