Release openh264v2.5.1

Makefile

@@ -39,7 +39,7 @@ USE_LOW_VERSION_NDK=No
 USE_ANT=No
 
 SHAREDLIB_MAJORVERSION=7
-FULL_VERSION := 2.5.0
+FULL_VERSION := 2.5.1
 
 ifeq (,$(wildcard $(SRC_PATH)gmp-api))
 HAVE_GMP_API=No

RELEASES

@@ -1,6 +1,10 @@
 
 Releases
 -----------
+v2.5.1
+------
+- Fix decoder heap overflow vulnerability (Commit: 63db555e, PR: #3818)
+
 v2.5.0
 ------
 - Fix some multi-thread decoding issues

build/platform-darwin.mk

@@ -3,7 +3,7 @@ SHAREDLIB_DIR = $(PREFIX)/lib
 SHAREDLIBSUFFIX = dylib
 SHAREDLIBSUFFIXFULLVER=$(FULL_VERSION).$(SHAREDLIBSUFFIX)
 SHAREDLIBSUFFIXMAJORVER=$(SHAREDLIB_MAJORVERSION).$(SHAREDLIBSUFFIX)
-CURRENT_VERSION := 2.5.0
+CURRENT_VERSION := 2.5.1
 COMPATIBILITY_VERSION := 2.5.0
 SHLDFLAGS = -dynamiclib -twolevel_namespace -undefined dynamic_lookup \
 	-fno-common -headerpad_max_install_names -install_name \

codec/api/wels/codec_ver.h

@@ -4,12 +4,12 @@
 
 #include "codec_app_def.h"
 
-static const OpenH264Version g_stCodecVersion  = {2, 5, 0, 2411};
-static const char* const g_strCodecVer  = "OpenH264 version:2.5.0.2411";
+static const OpenH264Version g_stCodecVersion  = {2, 5, 1, 2503};
+static const char* const g_strCodecVer  = "OpenH264 version:2.5.1.2503";
 
 #define OPENH264_MAJOR (2)
 #define OPENH264_MINOR (5)
-#define OPENH264_REVISION (0)
-#define OPENH264_RESERVED (2411)
+#define OPENH264_REVISION (1)
+#define OPENH264_RESERVED (2503)
 
 #endif  // CODEC_VER_H

codec/decoder/core/src/decoder.cpp

@@ -846,6 +846,10 @@ int32_t WelsDecodeBs (PWelsDecoderContext pCtx, const uint8_t* kpBsBuf, const in
             return pCtx->iErrorCode;
           }
 
+          if (pCtx->iErrorCode != ERR_NONE && !(pCtx->iErrorCode & dsDataErrorConcealed)) {
+              return pCtx->iErrorCode;
+          }
+
           pDstNal += (iDstIdx + 4); //init, increase 4 reserved zero bytes, used to store the next NAL
           if ((iSrcLength - iSrcConsumed + 4) > (pRawData->pEnd - pDstNal)) {
             pDstNal = pRawData->pCurPos = pRawData->pHead;

gmpopenh264.info

@@ -1,4 +1,4 @@
 Name: gmpopenh264
 Description: GMP Plugin for OpenH264.
-Version: 2.5.0
+Version: 2.5.1
 APIs: encode-video[h264], decode-video[h264]

meson.build

@@ -1,5 +1,5 @@
 project('openh264', ['c', 'cpp'],
-  version : '2.5.0',
+  version : '2.5.1',
   meson_version : '>= 0.52',
   default_options : [ 'warning_level=1',
                       'buildtype=debugoptimized' ])

openh264.rc

@@ -24,8 +24,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,5,0,2411
- PRODUCTVERSION 2,5,0,2411
+ FILEVERSION 2,5,1,2503
+ PRODUCTVERSION 2,5,1,2503
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -43,12 +43,12 @@ BEGIN
             VALUE "Comments", "Cisco OpenH264 codec"
             VALUE "CompanyName", "Cisco Systems Inc."
             VALUE "FileDescription", "Cisco OpenH264 codec"
-            VALUE "FileVersion", "2.5.0.2411"
+            VALUE "FileVersion", "2.5.1.2503"
             VALUE "InternalName", "openh264.dll"
             VALUE "LegalCopyright", "� 2011-2015 Cisco and/or its affiliates. All rights reserved."
             VALUE "OriginalFilename", "openh264.dll"
             VALUE "ProductName", "Cisco OpenH264 codec"
-            VALUE "ProductVersion", "2.5.0.2411"
+            VALUE "ProductVersion", "2.5.1.2503"
         END
     END
     BLOCK "VarFileInfo"