shithub: openh264

Info  •  Files  •  Log  •  Branches

Merge pull request #2380 from mstorsjo/fix-slice-realloc

Avoid reading iCountMbNumInSlice out of bounds on slice realloc

--- a/codec/encoder/core/src/encoder_ext.cpp

+++ b/codec/encoder/core/src/encoder_ext.cpp

@@ -4877,7 +4877,7 @@

     pSliceIdx->sSlicingOverRc.iTotalQpSlice         = 0;

     pSliceIdx->sSlicingOverRc.iTotalMbSlice         = 0;

     pSliceIdx->sSlicingOverRc.iTargetBitsSlice      = WELS_DIV_ROUND (kiBitsPerMb *

-                                                      pCurLayer->sLayerInfo.pSliceInLayer[uiSliceIdx].iCountMbNumInSlice,

+                                                      pSlice[uiSliceIdx].iCountMbNumInSlice,

                                                       INT_MULTIPLY);

     pSliceIdx->sSlicingOverRc.iFrameBitsSlice       = 0;

     pSliceIdx->sSlicingOverRc.iGomBitsSlice         = 0;