mirror of https://git.ffmpeg.org/ffmpeg.git
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>
This commit is contained in:
parent
0fb2b61614
commit
14d6ea0c45
|
@ -503,6 +503,7 @@ int av_frame_copy_props(AVFrame *dst, const AVFrame *src)
|
||||||
free_side_data(&dst->side_data[i]);
|
free_side_data(&dst->side_data[i]);
|
||||||
}
|
}
|
||||||
av_freep(&dst->side_data);
|
av_freep(&dst->side_data);
|
||||||
|
dst->nb_side_data = 0;
|
||||||
return AVERROR(ENOMEM);
|
return AVERROR(ENOMEM);
|
||||||
}
|
}
|
||||||
memcpy(sd_dst->data, sd_src->data, sd_src->size);
|
memcpy(sd_dst->data, sd_src->data, sd_src->size);
|
||||||
|
|
Loading…
Reference in New Issue