diff options
| author | Yaowu Xu <yaowu@google.com> | 2016-05-17 11:39:57 -0700 |
|---|---|---|
| committer | Yaowu Xu <yaowu@google.com> | 2016-05-17 11:39:57 -0700 |
| commit | 2240d83d7882ce2d5d0826b9ce33b86321d7a724 (patch) | |
| tree | 8b8b08710b0be4f1eb0c555477cf6a7ab7a5b3a0 /vp9/decoder/vp9_decoder.c | |
| parent | bdfbd6325ef8582beb0cb382f7d0f12cc488ecee (diff) | |
| download | libvpx-2240d83d7882ce2d5d0826b9ce33b86321d7a724.tar libvpx-2240d83d7882ce2d5d0826b9ce33b86321d7a724.tar.gz libvpx-2240d83d7882ce2d5d0826b9ce33b86321d7a724.tar.bz2 libvpx-2240d83d7882ce2d5d0826b9ce33b86321d7a724.zip | |
Promote to uint32_t before left shift
This commit change to promote uint8_t explicitly to uint32_t before
left shift operation.
BUG=https://bugs.chromium.org/p/chromium/issues/detail?id=612021
Change-Id: Id7059154efb5bdfa45889dabe72aaafd46d79f23
Diffstat (limited to 'vp9/decoder/vp9_decoder.c')
| -rw-r--r-- | vp9/decoder/vp9_decoder.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vp9/decoder/vp9_decoder.c b/vp9/decoder/vp9_decoder.c index ea018d052..935c04f3a 100644 --- a/vp9/decoder/vp9_decoder.c +++ b/vp9/decoder/vp9_decoder.c @@ -508,7 +508,7 @@ vpx_codec_err_t vp9_parse_superframe_index(const uint8_t *data, uint32_t this_sz = 0; for (j = 0; j < mag; ++j) - this_sz |= (*x++) << (j * 8); + this_sz |= ((uint32_t)(*x++)) << (j * 8); sizes[i] = this_sz; } *count = frames; |