osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Make it compil by adding a cast, not sure if payload_length = (int)tvb_get_ntoh64(tvb, 2); can overflow 

svn path=/trunk/; revision=45878
This commit is contained in:
Anders Broman 2012-11-03 15:36:09 +00:00
parent 6ef55f30d8
commit b117383961
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
epan/dissectors/packet-websocket.c
View File

@ -290,7 +290,7 @@ dissect_websocket(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat
pinfo->desegment_len = 2+2; pinfo->desegment_len = 2+2;
return 0; return 0;
} }
payload_length = (guint64)tvb_get_ntohs(tvb, 2); payload_length = tvb_get_ntohs(tvb, 2);
mask_offset = 2+2; mask_offset = 2+2;
} }
else if(short_length==127){ else if(short_length==127){
@ -298,7 +298,8 @@ dissect_websocket(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat
pinfo->desegment_len = 2+8; pinfo->desegment_len = 2+8;
return 0; return 0;
} }
payload_length = (guint64)tvb_get_ntoh64(tvb, 2); /* warning C4244: '=' : conversion from 'guint64' to 'int ', possible loss of data */
payload_length = (int)tvb_get_ntoh64(tvb, 2);
mask_offset = 2+8; mask_offset = 2+8;
} }
else{ else{
@ -311,6 +312,7 @@ dissect_websocket(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat
payload_offset = mask_offset + (mask ? 4 : 0); payload_offset = mask_offset + (mask ? 4 : 0);
if(length < payload_offset + payload_length){ if(length < payload_offset + payload_length){
/* XXXX Warning desegment_len is 32 bits */
pinfo->desegment_len = payload_offset + payload_length - length; pinfo->desegment_len = payload_offset + payload_length - length;
return 0; return 0;
} }