mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

ttmlrender: Fix segfault on _render_text_region()

Browse source 
Fix invalid memory access

https://bugzilla.gnome.org/show_bug.cgi?id=775965
This commit is contained in:
Seungha Yang 2016-12-12 10:43:43 +09:00 committed by Sebastian Dröge
parent ba1ad5f4cd
commit a5ce16f739
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ext/ttml/gstttmlrender.c
View file

@ -2151,8 +2151,14 @@ gst_ttml_render_render_text_region (GstTtmlRender * render,
} }
tmp = region_image; tmp = region_image;
region_image = gst_ttml_render_rendered_image_combine (region_image, if (region_image || blocks_image) {
blocks_image); region_image =
gst_ttml_render_rendered_image_combine (region_image, blocks_image);
} else {
GST_CAT_DEBUG (ttmlrender_debug, "Nothing to render");
return NULL;
}
if (tmp) if (tmp)
gst_ttml_render_rendered_image_free (tmp); gst_ttml_render_rendered_image_free (tmp);
gst_ttml_render_rendered_image_free (blocks_image); gst_ttml_render_rendered_image_free (blocks_image);
@ -2326,8 +2332,10 @@ wait_for_text_buf:
g_assert (region != NULL); g_assert (region != NULL);
composition = gst_ttml_render_render_text_region (render, region, composition = gst_ttml_render_render_text_region (render, region,
render->text_buffer); render->text_buffer);
render->compositions = g_list_append (render->compositions, if (composition) {
composition); render->compositions = g_list_append (render->compositions,
composition);
}
} }
render->need_render = FALSE; render->need_render = FALSE;
} }