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

More type cleanup to squelch warnings. 

Make exported_pdu_headers_size a size_t to make it big enough.  Make
used_buffer_length a size_t as it doesn't go negative and gets compared
with unsigned values.  Cast length to size_t when comparing it with
used_buffer_length - by that time, we've ensured that it's not negative.

Change-Id: Ie192eee55914ebe548865d46575768964353ea2d
Reviewed-on: https://code.wireshark.org/review/8021
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2015-04-11 13:40:40 -07:00
parent 08c083a930
commit afec93cb79
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
extcap/androiddump.c
View File

@ -1750,10 +1750,10 @@ static int capture_android_logcat(char *interface, char *fifo,
static char packet[PACKET_LENGTH];
static char helper_packet[PACKET_LENGTH];
ssize_t length;
ssize_t used_buffer_length = 0;
size_t used_buffer_length = 0;
int sock;
const char *protocol_name;
int exported_pdu_headers_size = 0;
size_t exported_pdu_headers_size = 0;
struct exported_pdu_header exported_pdu_header_protocol_events;
struct exported_pdu_header exported_pdu_header_protocol_normal;
struct exported_pdu_header *exported_pdu_header_protocol;
@ -1923,7 +1923,7 @@ static int capture_android_logcat(char *interface, char *fifo,
length = (*payload_length) + header_size + exported_pdu_headers_size;
while (used_buffer_length >= exported_pdu_headers_size + header_size && length <= used_buffer_length) {
while (used_buffer_length >= exported_pdu_headers_size + header_size && (size_t)length <= used_buffer_length) {
extcap_dumper_dump(extcap_dumper, packet,
length,
length,