Skip to content
Snippets Groups Projects
Commit a400edbb authored by wm4's avatar wm4 Committed by Michael Niedermayer
Browse files

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: default avatarMichael Niedermayer <michaelni@gmx.at>
parent 4fa42e04
No related branches found
No related tags found
No related merge requests found
...@@ -503,6 +503,7 @@ int av_frame_copy_props(AVFrame *dst, const AVFrame *src) ...@@ -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);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment