History

Merge "vp9: Fix potential SEGV in decoder_peek_si_internal"

Vignesh Venkatasubramanian committed 10 years ago

Commit 692fe742 parents bdeb5fe aa1c8132 files · +48 −5Browse files

Showing the changes to test/decode_api_test.cc (1 of 2 files). Show all

Unified · Split

test/decode_api_test.cc+34−0
@@ -143,6 +143,40 @@ TEST(DecodeAPI, Vp9InvalidDecode) { · 142 unmodified lines
143143 TestVp9Controls(&dec);
144144 EXPECT_EQ(VPX_CODEC_OK, vpx_codec_destroy(&dec));
145145 }
146+
147+TEST(DecodeAPI, Vp9PeekSI) {
148+ const vpx_codec_iface_t *const codec = &vpx_codec_vp9_dx_algo;
149+ // The first 9 bytes are valid and the rest of the bytes are made up. Until
150+ // size 10, this should return VPX_CODEC_UNSUP_BITSTREAM and after that it
151+ // should return VPX_CODEC_CORRUPT_FRAME.
152+ const uint8_t data[32] = {
153+ 0x85, 0xa4, 0xc1, 0xa1, 0x38, 0x81, 0xa3, 0x49,
154+ 0x83, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
155+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
156+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
157+ };
158+
159+ for (uint32_t data_sz = 1; data_sz <= 32; ++data_sz) {
160+ // Verify behavior of vpx_codec_decode. vpx_codec_decode doesn't even get
161+ // to decoder_peek_si_internal on frames of size < 8.
162+ if (data_sz >= 8) {
163+ vpx_codec_ctx_t dec;
164+ EXPECT_EQ(VPX_CODEC_OK, vpx_codec_dec_init(&dec, codec, NULL, 0));
165+ EXPECT_EQ((data_sz < 10) ?
166+ VPX_CODEC_UNSUP_BITSTREAM : VPX_CODEC_CORRUPT_FRAME,
167+ vpx_codec_decode(&dec, data, data_sz, NULL, 0));
168+ vpx_codec_iter_t iter = NULL;
169+ EXPECT_EQ(NULL, vpx_codec_get_frame(&dec, &iter));
170+ EXPECT_EQ(VPX_CODEC_OK, vpx_codec_destroy(&dec));
171+ }
172+
173+ // Verify behavior of vpx_codec_peek_stream_info.
174+ vpx_codec_stream_info_t si;
175+ si.sz = sizeof(si);
176+ EXPECT_EQ((data_sz < 10) ? VPX_CODEC_UNSUP_BITSTREAM : VPX_CODEC_OK,
177+ vpx_codec_peek_stream_info(codec, data, data_sz, &si));
178+ }
179+}
146180 #endif // CONFIG_VP9_DECODER
147181
148182 } // namespace

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t