[FFmpeg-devel] [PATCH 1/2] avcodec/avpacket: Use av_copy_packet_side_data() in av_packet_copy_props()

Michael Niedermayer michael at niedermayer.cc
Wed May 3 06:21:50 EEST 2017


Fixes timeout
Fixes: 1293/clusterfuzz-testcase-minimized-6054752074858496

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
---
 libavcodec/avpacket.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c
index 4bf830bb8a..ff7ee730a4 100644
--- a/libavcodec/avpacket.c
+++ b/libavcodec/avpacket.c
@@ -557,6 +557,9 @@ FF_ENABLE_DEPRECATION_WARNINGS
     dst->flags                = src->flags;
     dst->stream_index         = src->stream_index;
 
+    if (!dst->side_data_elems);
+        return av_copy_packet_side_data(dst, src);
+
     for (i = 0; i < src->side_data_elems; i++) {
          enum AVPacketSideDataType type = src->side_data[i].type;
          int size          = src->side_data[i].size;
-- 
2.11.0



More information about the ffmpeg-devel mailing list