Browse Source

Add missing checks on invalid pixel format in

av_image_fill_linesizes/pointers.

Originally committed as revision 25072 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/n0.8
Stefano Sabatini 15 years ago
parent
commit
6950cca97f
1 changed files with 2 additions and 2 deletions
  1. +2
    -2
      libavcore/imgutils.c

+ 2
- 2
libavcore/imgutils.c View File

@@ -66,7 +66,7 @@ int av_image_fill_linesizes(int linesizes[4], enum PixelFormat pix_fmt, int widt


memset(linesizes, 0, 4*sizeof(linesizes[0])); memset(linesizes, 0, 4*sizeof(linesizes[0]));


if (desc->flags & PIX_FMT_HWACCEL)
if ((unsigned)pix_fmt >= PIX_FMT_NB || desc->flags & PIX_FMT_HWACCEL)
return AVERROR(EINVAL); return AVERROR(EINVAL);


if (desc->flags & PIX_FMT_BITSTREAM) { if (desc->flags & PIX_FMT_BITSTREAM) {
@@ -93,7 +93,7 @@ int av_image_fill_pointers(uint8_t *data[4], enum PixelFormat pix_fmt, int heigh
memset(size , 0, sizeof(size)); memset(size , 0, sizeof(size));
memset(has_plane, 0, sizeof(has_plane)); memset(has_plane, 0, sizeof(has_plane));


if (desc->flags & PIX_FMT_HWACCEL)
if ((unsigned)pix_fmt >= PIX_FMT_NB || desc->flags & PIX_FMT_HWACCEL)
return AVERROR(EINVAL); return AVERROR(EINVAL);


data[0] = ptr; data[0] = ptr;


Loading…
Cancel
Save