kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-02 03:48:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 298054 via svnmerge from

Browse Source 
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
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@298055 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matthew Nicholson
2010-12-10 16:53:43 +00:00
parent 1b0df8c30f
commit 9f93c14bf5
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
res/res_fax.c
View File

@@ -928,9 +928,12 @@ static void set_channel_variables(struct ast_channel *chan, struct ast_fax_sessi
#define GENERIC_FAX_EXEC_SET_VARS(fax, chan, errorstr, reason) \ #define GENERIC_FAX_EXEC_SET_VARS(fax, chan, errorstr, reason) \
do { \ do { \
ast_string_field_set(fax->details, result, S_OR(fax->details->result, "FAILED")); \ if (ast_strlen_zero(fax->details->result)) \
ast_string_field_set(fax->details, resultstr, S_OR(fax->details->resultstr, reason)); \ ast_string_field_set(fax->details, result, "FAILED"); \
ast_string_field_set(fax->details, error, S_OR(fax->details->error, errorstr)); \ 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); \ set_channel_variables(chan, fax->details); \
} while (0) } while (0)