[asterisk-commits] mmichelson: branch 1.6.1 r218936 - in /branches/1.6.1: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Wed Sep 16 14:27:32 2009
New Revision: 218936

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=218936
Log:
Merged revisions 218933 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r218933 | mmichelson | 2009-09-16 14:25:36 -0500 (Wed, 16 Sep 2009) | 12 lines
  
  Reverse order of args to fread.
  
  This way, we don't always write a null byte into
  byte 1 of the buffer
  
  (closes issue #15905)
  Reported by: ebroad
  Patches:
        freadfix.patch uploaded by ebroad (license 878)
  Tested by: ebroad
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/channels/chan_sip.c

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

Modified: branches/1.6.1/channels/chan_sip.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/channels/chan_sip.c?view=diff&rev=218936&r1=218935&r2=218936
==============================================================================
--- branches/1.6.1/channels/chan_sip.c (original)
+++ branches/1.6.1/channels/chan_sip.c Wed Sep 16 14:27:32 2009
@@ -2450,7 +2450,7 @@
 			while (cl > 0) {
 				size_t bytes_read;
 				ast_mutex_lock(&tcptls_session->lock);
-				if (!(bytes_read = fread(buf, MIN(sizeof(buf) - 1, cl), 1, tcptls_session->f))) {
+				if (!(bytes_read = fread(buf, 1, MIN(sizeof(buf) - 1, cl), tcptls_session->f))) {
 					ast_mutex_unlock(&tcptls_session->lock);
 					goto cleanup;
 				}