From 21901f0e8ee18195cdbe748b93a98f974bb009b2 Mon Sep 17 00:00:00 2001 From: David Vossel Date: Fri, 2 Oct 2009 17:36:22 +0000 Subject: [PATCH] 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: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@222035 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_iax2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 3c9fd665cf..c9778d52a3 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]);