Browse Source

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@gmx.at>
(cherry picked from commit a400edbb6d)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.4.5
wm4 Michael Niedermayer 11 years ago
parent
commit
14d6ea0c45
1 changed files with 1 additions and 0 deletions
  1. +1
    -0
      libavutil/frame.c

+ 1
- 0
libavutil/frame.c View File

@@ -503,6 +503,7 @@ int av_frame_copy_props(AVFrame *dst, const AVFrame *src)
free_side_data(&dst->side_data[i]);
}
av_freep(&dst->side_data);
dst->nb_side_data = 0;
return AVERROR(ENOMEM);
}
memcpy(sd_dst->data, sd_src->data, sd_src->size);


Loading…
Cancel
Save