Module: libav Branch: release/12 Commit: 8cf3fdf73e21e554358e0293af04e21d4325787b
Author: James Almer <[email protected]> Committer: Anton Khirnov <[email protected]> Date: Sat Nov 19 15:33:58 2016 -0300 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 functionality of keeping the packet unchanged in case of error. Signed-off-by: James Almer <[email protected]> Signed-off-by: Anton Khirnov <[email protected]> (cherry picked from commit aa498c3183236a93206b4a0e8225b9db0660b50d) Signed-off-by: Anton Khirnov <[email protected]> --- libavcodec/avpacket.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c index 76fc4eb..7856dbf 100644 --- a/libavcodec/avpacket.c +++ b/libavcodec/avpacket.c @@ -240,16 +240,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; _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
