[asterisk-commits] mnicholson: branch 10 r335791 - in /branches/10: ./ main/manager.c

[SVN commits to the Asterisk project]

Author: mnicholson
Date: Wed Sep 14 08:28:50 2011
New Revision: 335791

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

........
  r335790 | mnicholson | 2011-09-14 08:28:16 -0500 (Wed, 14 Sep 2011) | 4 lines
  
  The tech and data members of fast_originate_helper are not string fields.
  
  ASTERISK-17709
........

Modified:
    branches/10/   (props changed)
    branches/10/main/manager.c

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

Modified: branches/10/main/manager.c
URL: http://svnview.digium.com/svn/asterisk/branches/10/main/manager.c?view=diff&rev=335791&r1=335790&r2=335791
==============================================================================
--- branches/10/main/manager.c (original)
+++ branches/10/main/manager.c Wed Sep 14 08:28:50 2011
@@ -4011,8 +4011,8 @@
 			if (!ast_strlen_zero(id)) {
 				ast_string_field_build(fast, idtext, "ActionID: %s", id);
 			}
-			ast_string_field_set(fast, tech, tech);
-			ast_string_field_set(fast, data, data);
+			ast_copy_string(fast->tech, tech, sizeof(fast->tech));
+			ast_copy_string(fast->data, data, sizeof(fast->data));
 			ast_string_field_set(fast, app, app);
 			ast_string_field_set(fast, appdata, appdata);
 			ast_string_field_set(fast, cid_num, l);