diff options
| author | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-10-02 17:36:22 +0000 |
|---|---|---|
| committer | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-10-02 17:36:22 +0000 |
| commit | 09d7057b16e908be12e95f85c7fa14eb355921f9 (patch) | |
| tree | 8d086f86377f377e557907466be0a66185f65d24 /channels | |
| parent | 2bd43aec35995511b0d4ea076804336905992854 (diff) | |
Merged revisions 222030 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r222030 | dvossel | 2009-10-02 12:34:07 -0500 (Fri, 02 Oct 2009) | 9 lines
Merged revisions 222026 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r222026 | dvossel | 2009-10-02 12:32:13 -0500 (Fri, 02 Oct 2009) | 3 lines
Removes unnecessary unlock, clarifies a memcpy.
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@222035 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_iax2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 3c9fd665c..c9778d52a 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -2451,7 +2451,7 @@ static int __find_callno(unsigned short callno, unsigned short dcallno, struct s } /* this searches for transfer call numbers that might not get caught otherwise */ memset(&tmp_pvt.addr, 0, sizeof(tmp_pvt.addr)); - memcpy(&tmp_pvt.transfer, sin, sizeof(tmp_pvt.addr)); + memcpy(&tmp_pvt.transfer, sin, sizeof(tmp_pvt.transfer)); if ((pvt = ao2_find(iax_transfercallno_pvts, &tmp_pvt, OBJ_POINTER))) { if (return_locked) { ast_mutex_lock(&iaxsl[pvt->callno]); |