[asterisk-commits] mnicholson: trunk r335792 - in /trunk: ./ main/manager.c

[SVN commits to the Asterisk project]

Author: mnicholson
Date: Wed Sep 14 08:29:41 2011
New Revision: 335792

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

................
  r335791 | mnicholson | 2011-09-14 08:28:50 -0500 (Wed, 14 Sep 2011) | 11 lines
  
  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:
    trunk/   (props changed)
    trunk/main/manager.c

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

Modified: trunk/main/manager.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/manager.c?view=diff&rev=335792&r1=335791&r2=335792
==============================================================================
--- trunk/main/manager.c (original)
+++ trunk/main/manager.c Wed Sep 14 08:29:41 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);