提交 5164d448 authored 作者: Viktor Krikun's avatar Viktor Krikun 提交者: Travis Cross

Minor bug fixes per Xcode static analyses tools

上级 35f741d5
...@@ -70,7 +70,7 @@ zrtp_status_t _zrtp_machine_process_while_in_initiatingsecure( zrtp_stream_t* st ...@@ -70,7 +70,7 @@ zrtp_status_t _zrtp_machine_process_while_in_initiatingsecure( zrtp_stream_t* st
break; break;
} }
s = _zrtp_machine_start_send_and_resend_dhpart2(stream); _zrtp_machine_start_send_and_resend_dhpart2(stream);
/* Perform Key generation according to draft 5.6 */ /* Perform Key generation according to draft 5.6 */
s = _zrtp_set_public_value(stream, 1); s = _zrtp_set_public_value(stream, 1);
...@@ -545,11 +545,13 @@ static zrtp_status_t _zrtp_machine_start_send_and_resend_confirm2(zrtp_stream_t ...@@ -545,11 +545,13 @@ static zrtp_status_t _zrtp_machine_start_send_and_resend_confirm2(zrtp_stream_t
ZRTP_CONFIRM2, ZRTP_CONFIRM2,
sizeof(zrtp_packet_Confirm_t) - sizeof(zrtp_msg_hdr_t), sizeof(zrtp_packet_Confirm_t) - sizeof(zrtp_msg_hdr_t),
&stream->messages.confirm.hdr); &stream->messages.confirm.hdr);
if (zrtp_status_ok == s) {
task->_is_enabled = 1;
task->callback = _send_and_resend_confirm2;
task->_retrys = 0;
_send_and_resend_confirm2(stream, task);
}
task->_is_enabled = 1; return s;
task->callback = _send_and_resend_confirm2;
task->_retrys = 0;
_send_and_resend_confirm2(stream, task);
return zrtp_status_ok;
} }
...@@ -453,11 +453,13 @@ zrtp_status_t _zrtp_packet_preparse( zrtp_stream_t* stream, ...@@ -453,11 +453,13 @@ zrtp_status_t _zrtp_packet_preparse( zrtp_stream_t* stream,
break; break;
case ZRTP_SASRELAY: case ZRTP_SASRELAY:
is_correct = !(*length < (RTP_HDR_SIZE + sizeof(zrtp_packet_SASRelay_t))); is_correct = !(*length < (RTP_HDR_SIZE + sizeof(zrtp_packet_SASRelay_t)));
break;
case ZRTP_GOCLEAR: case ZRTP_GOCLEAR:
is_correct = !(*length < (RTP_HDR_SIZE + sizeof(zrtp_packet_GoClear_t))); is_correct = !(*length < (RTP_HDR_SIZE + sizeof(zrtp_packet_GoClear_t)));
break; break;
case ZRTP_ERROR: case ZRTP_ERROR:
is_correct = !(*length < (RTP_HDR_SIZE + sizeof(zrtp_packet_Error_t))); is_correct = !(*length < (RTP_HDR_SIZE + sizeof(zrtp_packet_Error_t)));
break;
case ZRTP_ZFONEPING: case ZRTP_ZFONEPING:
case ZRTP_ZFONEPINGACK: case ZRTP_ZFONEPINGACK:
is_correct = !(*length < (RTP_HDR_SIZE + sizeof(zrtp_packet_zfoneping_t))); is_correct = !(*length < (RTP_HDR_SIZE + sizeof(zrtp_packet_zfoneping_t)));
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论