diff options
| author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-09-15 15:42:29 +0000 |
|---|---|---|
| committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-09-15 15:42:29 +0000 |
| commit | e6cade5eecc253ebf942967c5c8dc0f349686c8c (patch) | |
| tree | 5a2f8fc0a576117a63e3769a028d29414d75d09b /channels | |
| parent | be7da602d22cb94486f18dfdac24bd2fc4049925 (diff) | |
Merged revisions 218566 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r218566 | mmichelson | 2009-09-15 10:40:14 -0500 (Tue, 15 Sep 2009) | 4 lines
Use a better method of ensuring null-termination of the buffer
while reading the SDP when using TCP.
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@218574 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_sip.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 5a07d782e..f87fe8af8 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -2448,12 +2448,13 @@ static void *_sip_tcp_helper_thread(struct sip_pvt *pvt, struct ast_tcptls_sessi parse_request(&reqcpy); 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; |