From: Mark Michelson <mmichelson@digium.com>
Date: Tue, 15 Sep 2009 15:40:14 +0000 (+0000)
Subject: Use a better method of ensuring null-termination of the buffer
X-Git-Tag: 11.0.0-beta1~4168
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=15c7e6dea2a43eeef4569a047a502995cc29ecda;p=thirdparty%2Fasterisk.git

Use a better method of ensuring null-termination of the buffer
while reading the SDP when using TCP.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@218566 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 789b1a7dca..fff09c6148 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -2962,12 +2962,13 @@ static void *_sip_tcp_helper_thread(struct sip_pvt *pvt, struct ast_tcptls_sessi
 		/* In order to know how much to read, we need the content-length header */
 		if (sscanf(get_header(&reqcpy, "Content-Length"), "%30d", &cl)) {
 			while (cl > 0) {
+				size_t bytes_read;
 				ast_mutex_lock(&tcptls_session->lock);
-				if (!fread(buf, MIN(sizeof(buf) - 1, cl), 1, tcptls_session->f)) {
+				if (!(bytes_read = fread(buf, MIN(sizeof(buf) - 1, cl), 1, tcptls_session->f))) {
 					ast_mutex_unlock(&tcptls_session->lock);
 					goto cleanup;
 				}
-				buf[sizeof(buf)-1] = '\0';
+				buf[bytes_read] = '\0';
 				ast_mutex_unlock(&tcptls_session->lock);
 				if (me->stop)
 					goto cleanup;