har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pvfdec: prevent overflow during block alignment calculation

Browse Source 
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
This commit is contained in:
Andreas Cadhalpun 2016-12-15 02:14:54 +01:00
parent 8812d047bc
commit 169c1cfa92
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/pvfdec.c
View File

@ -19,6 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "libavcodec/internal.h"
#include "avformat.h" #include "avformat.h"
#include "internal.h" #include "internal.h"
#include "pcm.h" #include "pcm.h"
@ -44,7 +45,8 @@ static int pvf_read_header(AVFormatContext *s)
&bps) != 3) &bps) != 3)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
if (channels <= 0 || bps <= 0 || sample_rate <= 0) if (channels <= 0 || channels > FF_SANE_NB_CHANNELS ||
bps <= 0 || bps > INT_MAX / FF_SANE_NB_CHANNELS || sample_rate <= 0)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
st = avformat_new_stream(s, NULL); st = avformat_new_stream(s, NULL);