]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merged revisions 335790 via svnmerge from
authorMatthew Nicholson <mnicholson@digium.com>
Wed, 14 Sep 2011 13:28:50 +0000 (13:28 +0000)
committerMatthew Nicholson <mnicholson@digium.com>
Wed, 14 Sep 2011 13:28:50 +0000 (13:28 +0000)
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
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10@335791 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/manager.c

index 8dfcf3e94551d57ceac9aca7bb07afb63037864d..f25c6b516e4ea8fffc73bc9d2451ef05442a66a2 100644 (file)
@@ -4011,8 +4011,8 @@ static int action_originate(struct mansession *s, const struct message *m)
                        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);