Merged revisions 222026 via svnmerge from
authorDavid Vossel <dvossel@digium.com>
Fri, 2 Oct 2009 17:34:07 +0000 (17:34 +0000)
committerDavid Vossel <dvossel@digium.com>
Fri, 2 Oct 2009 17:34:07 +0000 (17:34 +0000)
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/trunk@222030 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_iax2.c

index b58036c..c3bc2b3 100644 (file)
@@ -2590,7 +2590,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));
                        }
                        /* 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]);
                        if ((pvt = ao2_find(iax_transfercallno_pvts, &tmp_pvt, OBJ_POINTER))) {
                                if (return_locked) {
                                        ast_mutex_lock(&iaxsl[pvt->callno]);