shithub: openh264

Info  •  Files  •  Log  •  Branches

Merge pull request #1872 from huili2/fix_1145964

fix order of null pointer protection

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

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

@@ -426,7 +426,7 @@

   if (pCtx->pCabacDecEngine == NULL)

     pCtx->pCabacDecEngine = (SWelsCabacDecEngine*) WelsMallocz (sizeof (SWelsCabacDecEngine), "pCtx->pCabacDecEngine");

-

+  WELS_VERIFY_RETURN_IF (ERR_INFO_OUT_OF_MEMORY, (NULL == pCtx->pCabacDecEngine))

   return ERR_NONE;

 }

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

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

@@ -1265,8 +1265,6 @@

                                 int8_t) * MB_PARTITION_SIZE, "pCtx->sMb.pSubMbType[]");

     pCtx->sMb.pSliceIdc[i] = (int32_t*) WelsMallocz (pCtx->sMb.iMbWidth * pCtx->sMb.iMbHeight * sizeof (int32_t),

                              "pCtx->sMb.pSliceIdc[]");	// using int32_t for slice_idc, 4/21/2010

-    if (pCtx->sMb.pSliceIdc[i] != NULL)

-      memset (pCtx->sMb.pSliceIdc[i], 0xff, (pCtx->sMb.iMbWidth * pCtx->sMb.iMbHeight * sizeof (int32_t)));

     pCtx->sMb.pResidualPredFlag[i] = (int8_t*) WelsMallocz (pCtx->sMb.iMbWidth * pCtx->sMb.iMbHeight * sizeof (int8_t),

                                      "pCtx->sMb.pResidualPredFlag[]");

     //pCtx->sMb.pMotionPredFlag[i] = (uint8_t *) WelsMallocz(pCtx->sMb.iMbWidth * pCtx->sMb.iMbHeight * sizeof(uint8_t), "pCtx->sMb.pMotionPredFlag[]");

@@ -1302,6 +1300,8 @@

                             (NULL == pCtx->sMb.pMbCorrectlyDecodedFlag[i])

                            )

                           )

+

+    memset (pCtx->sMb.pSliceIdc[i], 0xff, (pCtx->sMb.iMbWidth * pCtx->sMb.iMbHeight * sizeof (int32_t)));

     pCtx->pDqLayersList[i] = pDq;

     ++ i;

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

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

@@ -90,9 +90,9 @@

   } else {

     pPic->pBuffer[0]	= static_cast<uint8_t*> (WelsMallocz (iLumaSize /* luma */

                         + (iChromaSize << 1) /* Cb,Cr */, "_pic->buffer[0]"));

-    memset (pPic->pBuffer[0], 128, (iLumaSize + (iChromaSize << 1)));

-

     WELS_VERIFY_RETURN_PROC_IF (NULL, NULL == pPic->pBuffer[0], FreePicture (pPic));

+

+    memset (pPic->pBuffer[0], 128, (iLumaSize + (iChromaSize << 1)));

     pPic->iLinesize[0] = iPicWidth;

     pPic->iLinesize[1] = pPic->iLinesize[2] = iPicChromaWidth;

     pPic->pBuffer[1]	= pPic->pBuffer[0] + iLumaSize;