Use a better method of ensuring null-termination of the buffer
authorMark Michelson <mmichelson@digium.com>
Tue, 15 Sep 2009 15:40:14 +0000 (15:40 +0000)
committerMark Michelson <mmichelson@digium.com>
Tue, 15 Sep 2009 15:40:14 +0000 (15:40 +0000)
while reading the SDP when using TCP.

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

channels/chan_sip.c

index 789b1a7..fff09c6 100644 (file)
@@ -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;