diff options
| author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2004-10-30 09:19:14 +0000 |
|---|---|---|
| committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2004-10-30 09:19:14 +0000 |
| commit | 81f32f5add7dbb1e3c6438c0c4ff3d706e4672e3 (patch) | |
| tree | 74b76b318109b74d3309684936d6e3960c86da55 /epan/dissectors/packet-image-jfif.c | |
| parent | a31638b0b4689e49ce2298fe62ca9c199722758f (diff) | |
Squelch some compile warnings.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@12443 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-image-jfif.c')
| -rw-r--r-- | epan/dissectors/packet-image-jfif.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/epan/dissectors/packet-image-jfif.c b/epan/dissectors/packet-image-jfif.c index a5b3970be3..0efa4e4e56 100644 --- a/epan/dissectors/packet-image-jfif.c +++ b/epan/dissectors/packet-image-jfif.c @@ -659,7 +659,7 @@ process_app1_segment(proto_tree *tree, tvbuff_t *tvb, guint32 len, * Or should it just check against the segment length, * which is 16 bits? */ - if (val_32 + tiff_start < offset + 4) { + if (val_32 + tiff_start < (guint32)offset + 4) { proto_tree_add_text(subtree, tvb, offset, 4, "Start offset of IFD starting from the TIFF header start: %u bytes (bogus, should be >= %u", val_32, offset + 4 - tiff_start); @@ -672,7 +672,7 @@ process_app1_segment(proto_tree *tree, tvbuff_t *tvb, guint32 len, /* * Skip the following portion */ - if (val_32 + tiff_start > offset) { + if (val_32 + tiff_start > (guint32)offset) { proto_tree_add_text(subtree, tvb, offset, val_32 + tiff_start - offset, "Skipped data between end of TIFF header and start of IFD (%u bytes)", val_32 + tiff_start - offset); @@ -721,7 +721,8 @@ process_app1_segment(proto_tree *tree, tvbuff_t *tvb, guint32 len, } else { val_32 = tvb_get_ntohl(tvb, offset); } - if (val_32 != 0 && val_32 + tiff_start < offset + 4) { + if (val_32 != 0 && + val_32 + tiff_start < (guint32)offset + 4) { proto_tree_add_text(subtree, tvb, offset, 4, "Offset to next IFD from start of TIFF header: %u bytes (bogus, should be >= %u)", val_32, offset + 4 - tiff_start); |