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

two bugfixes (reported by buildbot randpkt): 

don't use the return value of gmtime, if it's NULL

prevent from an endless loop, if payload_length is 0

svn path=/trunk/; revision=13853
This commit is contained in:
Ulf Lamping 2005-03-21 20:01:35 +00:00
parent 22084517ad
commit d2afae8211
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
epan/dissectors/packet-kink.c
View File

@ -413,8 +413,12 @@ dissect_payload_kink_ap_rep(packet_info *pinfo, tvbuff_t *tvb, int offset, proto
/* Analize time by the utc. */
timer = tvb_get_ntohl(tvb, offset);
tp = gmtime(&timer);
proto_tree_add_text(payload_kink_ap_rep_tree, tvb, offset, 4, "EPOCH: month %u. day %u. year %u.%u.%u.%u by UTC",
if(tp){
proto_tree_add_text(payload_kink_ap_rep_tree, tvb, offset, 4, "EPOCH: month %u. day %u. year %u.%u.%u.%u by UTC",
(tp->tm_mon)+1, tp->tm_mday, (tp->tm_year)+1900, tp->tm_hour, tp->tm_min, tp->tm_sec);
} else {
proto_tree_add_text(payload_kink_ap_rep_tree, tvb, offset, 4, "EPOCH: value invalid");
}
offset += 4;
if(payload_length > PAYLOAD_HEADER){
@ -821,7 +825,11 @@ dissect_payload_kink_not_defined(packet_info *pinfo, tvbuff_t *tvb, int offset,
payload_length += (PADDING - (payload_length % PADDING));
}
offset = start_payload_offset + payload_length;
control_payload(pinfo, tvb, offset, next_payload, tree);
/* XXX - prevent an endless loop if payload_length is 0, don't know the correct way to handle this! */
if(payload_length != 0) {
control_payload(pinfo, tvb, offset, next_payload, tree);
}
}
/* Output part */