shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Fix bug in error handling that causes segfault"

--- a/test/invalid_file_test.cc

+++ b/test/invalid_file_test.cc

@@ -64,7 +64,7 @@

   FILE *res_file_;

 };

-TEST_P(InvalidFileTest, DISABLED_ReturnCode) {

+TEST_P(InvalidFileTest, ReturnCode) {

   const std::string filename = GET_PARAM(1);

   libvpx_test::CompressedVideoSource *video = NULL;

--- a/vp9/decoder/vp9_decodeframe.c

+++ b/vp9/decoder/vp9_decodeframe.c

@@ -1077,7 +1077,7 @@

     // Show an existing frame directly.

     const int frame_to_show = cm->ref_frame_map[vp9_rb_read_literal(rb, 3)];

-    if (cm->frame_bufs[frame_to_show].ref_count < 1)

+    if (frame_to_show < 0 || cm->frame_bufs[frame_to_show].ref_count < 1)

       vpx_internal_error(&cm->error, VPX_CODEC_UNSUP_BITSTREAM,

                          "Buffer %d does not contain a decoded frame",

                          frame_to_show);

--- a/vp9/decoder/vp9_decoder.c

+++ b/vp9/decoder/vp9_decoder.c

@@ -260,10 +260,10 @@

     // TODO(jkoleszar): Error concealment is undefined and non-normative

     // at this point, but if it becomes so, [0] may not always be the correct

     // thing to do here.

-    if (cm->frame_refs[0].idx != INT_MAX)

+    if (cm->frame_refs[0].idx != INT_MAX && cm->frame_refs[0].buf != NULL)

       cm->frame_refs[0].buf->corrupted = 1;

-    if (cm->frame_bufs[cm->new_fb_idx].ref_count > 0)

+    if (cm->new_fb_idx > 0 && cm->frame_bufs[cm->new_fb_idx].ref_count > 0)

       cm->frame_bufs[cm->new_fb_idx].ref_count--;

     return -1;