[svn-commits] dvossel: branch 1.6.0 r222038 - in /branches/1.6.0: ./ channels/chan_iax2.c

[SVN commits to the Digium repositories]

Author: dvossel
Date: Fri Oct  2 12:37:16 2009
New Revision: 222038

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=222038
Log:
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.
  ........
................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_iax2.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/chan_iax2.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/channels/chan_iax2.c?view=diff&rev=222038&r1=222037&r2=222038
==============================================================================
--- branches/1.6.0/channels/chan_iax2.c (original)
+++ branches/1.6.0/channels/chan_iax2.c Fri Oct  2 12:37:16 2009
@@ -2396,7 +2396,7 @@
 			}
 			/* 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 @@
 			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;