Commit 6ab6656e authored by Jeffrey Kardatzke's avatar Jeffrey Kardatzke Committed by Commit Bot

Fix integer overflow with log2_min_ipcm_cb_size_y in H265Parser

BUG=b:153111783,chromium:1152523
TEST=Fuzzer passes

Change-Id: I27f353116d6703b065cecef527c24487f627f67b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2558788
Auto-Submit: Jeffrey Kardatzke <jkardatzke@google.com>
Commit-Queue: Dale Curtis <dalecurtis@chromium.org>
Reviewed-by: default avatarSergey Volk <servolk@chromium.org>
Reviewed-by: default avatarDale Curtis <dalecurtis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#830735}
parent 44e9fe8a
...@@ -670,6 +670,7 @@ H265Parser::Result H265Parser::ParseSPS(int* sps_id) { ...@@ -670,6 +670,7 @@ H265Parser::Result H265Parser::ParseSPS(int* sps_id) {
TRUE_OR_RETURN(sps->pcm_sample_bit_depth_chroma_minus1 + 1 <= TRUE_OR_RETURN(sps->pcm_sample_bit_depth_chroma_minus1 + 1 <=
sps->bit_depth_c); sps->bit_depth_c);
READ_UE_OR_RETURN(&sps->log2_min_pcm_luma_coding_block_size_minus3); READ_UE_OR_RETURN(&sps->log2_min_pcm_luma_coding_block_size_minus3);
IN_RANGE_OR_RETURN(sps->log2_min_pcm_luma_coding_block_size_minus3, 0, 2);
int log2_min_ipcm_cb_size_y = int log2_min_ipcm_cb_size_y =
sps->log2_min_pcm_luma_coding_block_size_minus3 + 3; sps->log2_min_pcm_luma_coding_block_size_minus3 + 3;
IN_RANGE_OR_RETURN(log2_min_ipcm_cb_size_y, std::min(min_cb_log2_size_y, 5), IN_RANGE_OR_RETURN(log2_min_ipcm_cb_size_y, std::min(min_cb_log2_size_y, 5),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment