[FFmpeg-cvslog] lavu/frame: fix malloc error path in av_frame_copy_props()

[wm4]

ffmpeg | branch: release/2.2 | wm4 <nfxjfg at googlemail.com> | Mon Dec 15 04:32:58 2014 +0100| [b9510b3274cf1e37079aafdeacf020818908d989] | committer: Michael Niedermayer

lavu/frame: fix malloc error path in av_frame_copy_props()

The error path frees all side data, but forgets to reset the side data
count. This can blow up later in av_frame_unref() and free_side_data().

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit a400edbb6d00c0211de38e4f1b4f593681db91d8)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b9510b3274cf1e37079aafdeacf020818908d989
---

 libavutil/frame.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/libavutil/frame.c b/libavutil/frame.c
index 747aa79..32a41fb 100644
--- a/libavutil/frame.c
+++ b/libavutil/frame.c
@@ -487,6 +487,7 @@ int av_frame_copy_props(AVFrame *dst, const AVFrame *src)
                 av_dict_free(&dst->side_data[i]->metadata);
             }
             av_freep(&dst->side_data);
+            dst->nb_side_data = 0;
             return AVERROR(ENOMEM);
         }
         memcpy(sd_dst->data, sd_src->data, sd_src->size);