diff options
| author | James Zern <jzern@google.com> | 2014-02-28 19:58:19 -0800 |
|---|---|---|
| committer | James Zern <jzern@google.com> | 2014-02-28 19:58:19 -0800 |
| commit | ba159a3b0a80ff97e17ad946da4b7fef4a7cfe5a (patch) | |
| tree | 75204ff7d4066188612ba415ec8b8ce11a6fa4ed /third_party/nestegg | |
| parent | d743bd04d5c9261244bbe2838dc8014d770b621d (diff) | |
| download | libvpx-ba159a3b0a80ff97e17ad946da4b7fef4a7cfe5a.tar libvpx-ba159a3b0a80ff97e17ad946da4b7fef4a7cfe5a.tar.gz libvpx-ba159a3b0a80ff97e17ad946da4b7fef4a7cfe5a.tar.bz2 libvpx-ba159a3b0a80ff97e17ad946da4b7fef4a7cfe5a.zip | |
nestegg: fix track_number uint64->uint32 warnings
ne_read_block/ne_find_cue_position_for_track/nestegg_get_cue_point
in the use of ne_map_track_number_to_index
+ add a check to ensure it doesn't exceed the type bounds
fixes:
./third_party/nestegg/src/nestegg.c|1322| warning C4244: 'function' :
conversion from 'uint64_t' to 'unsigned int', possible loss of data
Change-Id: I3703d739dcf9a2d4d8e2b704e957e5e3fd80dca0
Diffstat (limited to 'third_party/nestegg')
| -rw-r--r-- | third_party/nestegg/README.webm | 1 | ||||
| -rw-r--r-- | third_party/nestegg/src/nestegg.c | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/third_party/nestegg/README.webm b/third_party/nestegg/README.webm index 4882887ab..9a436976d 100644 --- a/third_party/nestegg/README.webm +++ b/third_party/nestegg/README.webm @@ -15,3 +15,4 @@ Local Modifications: fixes: nestegg.c|975 col 6| warning: ‘r’ may be used uninitialized in this function [-Wuninitialized] - add ne_get_uint32 convenience function +- fix track_number uint64->uint32 warnings diff --git a/third_party/nestegg/src/nestegg.c b/third_party/nestegg/src/nestegg.c index f76015aef..70f034664 100644 --- a/third_party/nestegg/src/nestegg.c +++ b/third_party/nestegg/src/nestegg.c @@ -1260,7 +1260,7 @@ ne_read_block(nestegg * ctx, uint64_t block_id, uint64_t block_size, nestegg_pac if (r != 1) return r; - if (track_number == 0) + if (track_number == 0 || (unsigned int)track_number != track_number) return -1; consumed += length; @@ -1333,7 +1333,7 @@ ne_read_block(nestegg * ctx, uint64_t block_id, uint64_t block_size, nestegg_pac if (total > block_size) return -1; - if (ne_map_track_number_to_index(ctx, track_number, &track) != 0) + if (ne_map_track_number_to_index(ctx, (unsigned int)track_number, &track) != 0) return -1; entry = ne_find_track_entry(ctx, track); @@ -1858,7 +1858,7 @@ nestegg_get_cue_point(nestegg * ctx, unsigned int cluster_num, int64_t max_offse if (ne_get_uint(pos->track, &track_number) != 0) return -1; - if (ne_map_track_number_to_index(ctx, track_number, &track_index) != 0) + if (ne_map_track_number_to_index(ctx, (unsigned int)track_number, &track_index) != 0) return -1; if (track_index == track) { |