diff options
| author | Martin Storsjö <martin@martin.st> | 2013-09-11 23:09:37 +0300 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2013-09-16 11:22:42 +0300 |
| commit | 85e8192b8593816c0445411a5bef5fc5363a9b6d (patch) | |
| tree | 3ddfcb7b8eecbff73df9fcd6ff0e72d7d62cee45 /libavcodec/avpacket.c | |
| parent | 6fc8226e29055858f28973bb3d27b63b3b65e616 (diff) | |
| download | ffmpeg-85e8192b8593816c0445411a5bef5fc5363a9b6d.tar.gz | |
avpacket: Fix error checking in packet_alloc
Previously the wrong buffer pointer was checked, when buf
instead of *buf was checked. But checking the return value
instead is even better.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavcodec/avpacket.c')
| -rw-r--r-- | libavcodec/avpacket.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c index 79123b186c..c0a0f8cd7b 100644 --- a/libavcodec/avpacket.c +++ b/libavcodec/avpacket.c @@ -64,12 +64,13 @@ FF_ENABLE_DEPRECATION_WARNINGS static int packet_alloc(AVBufferRef **buf, int size) { + int ret; if ((unsigned)size >= (unsigned)size + FF_INPUT_BUFFER_PADDING_SIZE) return AVERROR(EINVAL); - av_buffer_realloc(buf, size + FF_INPUT_BUFFER_PADDING_SIZE); - if (!buf) - return AVERROR(ENOMEM); + ret = av_buffer_realloc(buf, size + FF_INPUT_BUFFER_PADDING_SIZE); + if (ret < 0) + return ret; memset((*buf)->data + size, 0, FF_INPUT_BUFFER_PADDING_SIZE); |