]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merged revisions 222030 via svnmerge from
authorDavid Vossel <dvossel@digium.com>
Fri, 2 Oct 2009 17:36:22 +0000 (17:36 +0000)
committerDavid Vossel <dvossel@digium.com>
Fri, 2 Oct 2009 17:36:22 +0000 (17:36 +0000)
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

index 3c9fd665cf1a2ec3746db31dbd975bbc1474d48d..c9778d52a3de265715aacddd5042322e72930571 100644 (file)
@@ -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]);