shithub: openh264

Info  •  Files  •  Log  •  Branches

fix BugZilla Bug-1479658 index -1 out of bounds for type 'int16_t [17]'

--- a/codec/decoder/core/src/mv_pred.cpp

+++ b/codec/decoder/core/src/mv_pred.cpp

@@ -678,7 +678,8 @@

       UpdateP16x16MotionOnly (pCurLayer, LIST_1, iMvp[LIST_1]);

       UpdateP16x16RefIdx (pCurLayer, LIST_0, ref[LIST_0]);

     } else {

-      ref[LIST_0] = pCurLayer->iColocRefIndex[LIST_0][0];

+      ref[LIST_0] = pCurLayer->iColocRefIndex[LIST_0][0] >= 0 ? pCurLayer->iColocRefIndex[LIST_0][0] :

+                    pCurLayer->iColocRefIndex[LIST_1][0];

       const int16_t (*mvColoc)[2] = 0 == ref[LIST_0] ? pCurLayer->iColocMv[LIST_0] : pCurLayer->iColocMv[LIST_1];

       const int16_t* mv = mvColoc[0];

       UpdateP16x16RefIdx (pCurLayer, LIST_0, ref[LIST_0]);