From: David Vossel <dvossel@digium.com>
Date: Fri, 2 Oct 2009 17:37:16 +0000 (+0000)
Subject: Merged revisions 222030 via svnmerge from
X-Git-Tag: 1.6.0.16-rc2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8536c226c0ae08b015004dab611432a8de643a7f;p=thirdparty%2Fasterisk.git

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.0@222038 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index cc89fc7086..aad43194bd 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -2396,7 +2396,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]);
@@ -9280,7 +9280,6 @@ static int socket_process(struct iax2_thread *thread)
 			if (f.frametype == AST_FRAME_IAX) {
 				if (iax_parse_ies(&ies, thread->buf + sizeof(*fh), f.datalen)) {
 					ast_log(LOG_WARNING, "Undecodable frame received from '%s'\n", ast_inet_ntoa(sin.sin_addr));
-					ast_mutex_unlock(&iaxsl[fr->callno]);
 					return 1;
 				}
 				f.data = NULL;