[asterisk-commits] mmichelson: branch 1.6.0 r218505 - in /branches/1.6.0: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Tue Sep 15 10:11:50 2009
New Revision: 218505

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

........
  r218499 | mmichelson | 2009-09-15 09:59:50 -0500 (Tue, 15 Sep 2009) | 3 lines
  
  Fix off-by-one error when reading SDP sent over TCP.
........
  r218504 | mmichelson | 2009-09-15 10:05:53 -0500 (Tue, 15 Sep 2009) | 3 lines
  
  Ensure that SDP read from TCP socket is null-terminated.
........

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

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

Modified: branches/1.6.0/channels/chan_sip.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.0/channels/chan_sip.c?view=diff&rev=218505&r1=218504&r2=218505
==============================================================================
--- branches/1.6.0/channels/chan_sip.c (original)
+++ branches/1.6.0/channels/chan_sip.c Tue Sep 15 10:11:50 2009
@@ -2276,10 +2276,11 @@
 		if (sscanf(get_header(&reqcpy, "Content-Length"), "%30d", &cl)) {
 			while (cl > 0) {
 				ast_mutex_lock(&tcptls_session->lock);
-				if (!fread(buf, (cl < sizeof(buf)) ? cl : sizeof(buf), 1, tcptls_session->f)) {
+				if (!fread(buf, MIN(sizeof(buf) - 1, cl), 1, tcptls_session->f)) {
 					ast_mutex_unlock(&tcptls_session->lock);
 					goto cleanup;
 				}
+				buf[sizeof(buf)-1] = '\0';
 				ast_mutex_unlock(&tcptls_session->lock);
 				if (me->stop)
 					goto cleanup;