diff options
| author | James Almer <jamrial@gmail.com> | 2016-11-19 12:38:44 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2016-11-19 20:24:23 -0300 |
| commit | 492bbe58902ddf7f9085f13345fd01098c44c6de (patch) | |
| tree | 77a934bbb1da83a4a80dc414ac9445d9f62b33e8 | |
| parent | 5771a0c8237d6fb0fb65877126ec0f7842fd2a1e (diff) | |
| download | ffmpeg-492bbe58902ddf7f9085f13345fd01098c44c6de.tar.gz | |
avcodec/avpacket: fix leak on realloc in av_packet_add_side_data()
If realloc fails, the pointer is overwritten and the previously allocated
buffer is leaked, which goes against the expected behavior of keeping the
packet unchanged in case of error.
Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
(cherry picked from commit 574929d8b6de32ae712fcca7ab09f01a3e4616be)
| -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 6de85dea1d..b3acc8838b 100644 --- a/libavcodec/avpacket.c +++ b/libavcodec/avpacket.c @@ -280,16 +280,17 @@ FF_ENABLE_DEPRECATION_WARNINGS int av_packet_add_side_data(AVPacket *pkt, enum AVPacketSideDataType type, uint8_t *data, size_t size) { + AVPacketSideData *tmp; int elems = pkt->side_data_elems; if ((unsigned)elems + 1 > INT_MAX / sizeof(*pkt->side_data)) return AVERROR(ERANGE); - pkt->side_data = av_realloc(pkt->side_data, - (elems + 1) * sizeof(*pkt->side_data)); - if (!pkt->side_data) + tmp = av_realloc(pkt->side_data, (elems + 1) * sizeof(*tmp)); + if (!tmp) return AVERROR(ENOMEM); + pkt->side_data = tmp; pkt->side_data[elems].data = data; pkt->side_data[elems].size = size; pkt->side_data[elems].type = type; |