kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

FS-9638 #comment fix seg when read -1

This commit is contained in:
Seven Du 2016-11-15 09:49:54 +08:00
parent 407c1b20dd
commit f3b7105d66
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/switch_msrp.c
View File

@ -403,8 +403,15 @@ static switch_status_t msrp_socket_recv(msrp_client_socket_t *csock, char *buf,
switch_status_t status = SWITCH_STATUS_FALSE; switch_status_t status = SWITCH_STATUS_FALSE;
if (csock->secure) { if (csock->secure) {
*len = SSL_read(globals.ssl, buf, *len); ssize_t r;
if (*len) status = SWITCH_STATUS_SUCCESS; r = SSL_read(globals.ssl, buf, *len);
if (r < 0) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "TLS read error: %" SWITCH_SSIZE_T_FMT "\n", r);
*len = 0;
} else {
*len = r;
status = SWITCH_STATUS_SUCCESS;
}
} else { } else {
status = switch_socket_recv(csock->sock, buf, len); status = switch_socket_recv(csock->sock, buf, len);
} }
@ -959,8 +966,8 @@ static void *SWITCH_THREAD_FUNC msrp_worker(switch_thread_t *thread, void *obj)
switch_safe_free(msrp_msg); switch_safe_free(msrp_msg);
msrp_msg = NULL; msrp_msg = NULL;
while(msrp_socket_recv(csock, p, &len) == SWITCH_STATUS_SUCCESS) { while (msrp_socket_recv(csock, p, &len) == SWITCH_STATUS_SUCCESS) {
// switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "read bytes:%ld\n", len); // switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "read bytes:%" SWITCH_SIZE_T_FMT "\n", len);
if (helper->debug) dump_buffer(buf, (p - buf) + len, __LINE__); if (helper->debug) dump_buffer(buf, (p - buf) + len, __LINE__);