ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-10-02 03:00:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '10d4c5e55e5b23e165aa4c7723073ebe2c2e7da0'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-12-15 22:12:40 +01:00
commit 4cffcbc809
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
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);