diff options
| author | Tom Sepez <tsepez@chromium.org> | 2017-03-14 15:53:36 -0700 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-03-15 00:03:38 +0000 |
| commit | 193e6ca5e48ee99e620f0e7546f1407ba1a20323 (patch) | |
| tree | 11d920c59a89247d28fe590d77ab6d6a9ce37a0c /core/fxcodec | |
| parent | cd5139a291113f177d3494990efbcaf388d1f3bf (diff) | |
| download | pdfium-193e6ca5e48ee99e620f0e7546f1407ba1a20323.tar.xz | |
Add IndexInBounds() convenience routine.
Avoid writing |Type| in CollectionSize<Type>() so that index
type can change without rewriting conditions.
Change-Id: I40c94ca39148b379908760ba9b861114b88af7bb
Reviewed-on: https://pdfium-review.googlesource.com/3056
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'core/fxcodec')
| -rw-r--r-- | core/fxcodec/lgif/fx_gif.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/fxcodec/lgif/fx_gif.cpp b/core/fxcodec/lgif/fx_gif.cpp index c4661b0acd..c109b6193d 100644 --- a/core/fxcodec/lgif/fx_gif.cpp +++ b/core/fxcodec/lgif/fx_gif.cpp @@ -841,11 +841,11 @@ int32_t gif_decode_image_info(gif_decompress_struct_p gif_ptr) { gif_save_decoding_status(gif_ptr, GIF_D_STATUS_IMG_DATA); return 1; } + int32_t gif_load_frame(gif_decompress_struct_p gif_ptr, int32_t frame_num) { - if (!gif_ptr || frame_num < 0 || - frame_num >= pdfium::CollectionSize<int>(*gif_ptr->img_ptr_arr_ptr)) { + if (!gif_ptr || !pdfium::IndexInBounds(*gif_ptr->img_ptr_arr_ptr, frame_num)) return 0; - } + uint8_t* data_size_ptr = nullptr; uint8_t* data_ptr = nullptr; uint32_t skip_size_org = gif_ptr->skip_size; |