Browse Source

Merge commit '10d4c5e55e5b23e165aa4c7723073ebe2c2e7da0'

* commit '10d4c5e55e5b23e165aa4c7723073ebe2c2e7da0':
  tiff: set the correct return value when check_size() fails

Merged-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.6
Michael Niedermayer 11 years ago
parent
commit
4cffcbc809
1 changed files with 3 additions and 1 deletions
  1. +3
    -1
      libavcodec/tiffenc.c

+ 3
- 1
libavcodec/tiffenc.c View File

@@ -334,8 +334,10 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
s->buf = &ptr;
s->buf_size = pkt->size;

if (check_size(s, 8))
if (check_size(s, 8)) {
ret = AVERROR(EINVAL);
goto fail;
}

// write header
bytestream_put_le16(&ptr, 0x4949);


Loading…
Cancel
Save