Merge pull request #235 from theirix/fix-overflow-oscar

Fixed overflow in Oscar
This commit is contained in:
Michele Campus
2016-07-26 10:37:36 +02:00
committed by GitHub
+9 -1
View File
@@ -244,11 +244,19 @@ static void ndpi_search_oscar_tcp_connect(struct ndpi_detection_module_struct
*/
if (channel == DATA)
{
family = get_u_int16_t(packet->payload, 6);
if (packet->payload_packet_len >= 8)
family = get_u_int16_t(packet->payload, 6);
else
family = 0;
if (packet->payload_packet_len >= 10)
type = get_u_int16_t(packet->payload, 8);
else
type = 0;
if (family == 0 || type == 0)
{
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_OSCAR);
return;
}
/* Family 0x0001 */
if (family == htons(GE_SE_CTL))