shithub: openh264

Info  •  Files  •  Log  •  Branches

Merge pull request #2641 from ruil2/memory

use the correct return value when memory can't be allocated.

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

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

@@ -3627,6 +3627,11 @@

   }

   // perform csc/denoise/downsample/padding, generate spatial layers

   iSpatialNum = pCtx->pVpp->BuildSpatialPicList (pCtx, pSrcPic);

+  if (iSpatialNum == -1) {

+    WelsLog (& (pCtx->sLogCtx), WELS_LOG_ERROR, "Failed in allocating memory in BuildSpatialPicList");

+    return ENC_RETURN_MEMALLOCERR;

+  }

+

   if (pCtx->pFuncList->pfRc.pfWelsUpdateMaxBrWindowStatus) {

     pCtx->pFuncList->pfRc.pfWelsUpdateMaxBrWindowStatus (pCtx, iSpatialNum, pFbi->uiTimeStamp);

   }