mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-05 23:18:52 +00:00
Code Issues 1 Projects Releases Wiki Activity

ccconverter: fix unintialized read of mapped output info in error case

Browse source 
We only need to gst_buffer_unmap() if we have gst_buffer_map()ed.  In
most cases we can shorten the lenght of time we need to map the output
buffer.  Fix similar occurences elsewhere.

CID 1463349

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1262>
This commit is contained in:
Matthew Waters 2020-05-12 16:00:58 +10:00
parent f077189809
commit ebc19d19bb
1 changed files with 11 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
ext/closedcaption/gstccconverter.c
View file

@ -1457,8 +1457,6 @@ convert_cea608_raw_cea708_cdp (GstCCConverter * self, GstBuffer * inbuf,
if (!out_fps_entry || out_fps_entry->fps_n == 0) if (!out_fps_entry || out_fps_entry->fps_n == 0)
g_assert_not_reached (); g_assert_not_reached ();
gst_buffer_map (outbuf, &out, GST_MAP_WRITE);
if (!fit_and_scale_cc_data (self, in_fps_entry, out_fps_entry, NULL, 0, if (!fit_and_scale_cc_data (self, in_fps_entry, out_fps_entry, NULL, 0,
cea608_1, &cea608_1_len, NULL, 0, tc_meta ? &tc_meta->tc : NULL)) cea608_1, &cea608_1_len, NULL, 0, tc_meta ? &tc_meta->tc : NULL))
goto drop; goto drop;
@ -1467,14 +1465,14 @@ convert_cea608_raw_cea708_cdp (GstCCConverter * self, GstBuffer * inbuf,
cea608_1_len, NULL, 0, cc_data, &cc_data_len)) cea608_1_len, NULL, 0, cc_data, &cc_data_len))
goto drop; goto drop;
gst_buffer_map (outbuf, &out, GST_MAP_WRITE);
cc_data_len = cc_data_len =
convert_cea708_cc_data_cea708_cdp_internal (self, cc_data, cc_data_len, convert_cea708_cc_data_cea708_cdp_internal (self, cc_data, cc_data_len,
out.data, out.size, &self->current_output_timecode, out_fps_entry); out.data, out.size, &self->current_output_timecode, out_fps_entry);
self->output_frames++; self->output_frames++;
out:
gst_buffer_unmap (outbuf, &out); gst_buffer_unmap (outbuf, &out);
out:
gst_buffer_set_size (outbuf, cc_data_len); gst_buffer_set_size (outbuf, cc_data_len);
return GST_FLOW_OK; return GST_FLOW_OK;
@ -1618,25 +1616,25 @@ convert_cea608_s334_1a_cea708_cdp (GstCCConverter * self, GstBuffer * inbuf,
if (!out_fps_entry || out_fps_entry->fps_n == 0) if (!out_fps_entry || out_fps_entry->fps_n == 0)
g_assert_not_reached (); g_assert_not_reached ();
gst_buffer_map (outbuf, &out, GST_MAP_WRITE);
if (!fit_and_scale_cc_data (self, in_fps_entry, out_fps_entry, NULL, 0, if (!fit_and_scale_cc_data (self, in_fps_entry, out_fps_entry, NULL, 0,
cea608_1, &cea608_1_len, cea608_2, &cea608_2_len, cea608_1, &cea608_1_len, cea608_2, &cea608_2_len,
tc_meta ? &tc_meta->tc : NULL)) tc_meta ? &tc_meta->tc : NULL)) {
goto drop; goto drop;
}
if (!combine_cc_data (self, TRUE, out_fps_entry, NULL, 0, cea608_1, if (!combine_cc_data (self, TRUE, out_fps_entry, NULL, 0, cea608_1,
cea608_1_len, cea608_2, cea608_2_len, cc_data, &cc_data_len)) cea608_1_len, cea608_2, cea608_2_len, cc_data, &cc_data_len)) {
goto drop; goto drop;
}
gst_buffer_map (outbuf, &out, GST_MAP_WRITE);
cc_data_len = cc_data_len =
convert_cea708_cc_data_cea708_cdp_internal (self, cc_data, cc_data_len, convert_cea708_cc_data_cea708_cdp_internal (self, cc_data, cc_data_len,
out.data, out.size, &self->current_output_timecode, out_fps_entry); out.data, out.size, &self->current_output_timecode, out_fps_entry);
self->output_frames++; self->output_frames++;
out:
gst_buffer_unmap (outbuf, &out); gst_buffer_unmap (outbuf, &out);
out:
gst_buffer_set_size (outbuf, cc_data_len); gst_buffer_set_size (outbuf, cc_data_len);
return GST_FLOW_OK; return GST_FLOW_OK;
@ -1771,15 +1769,12 @@ convert_cea708_cc_data_cea708_cdp (GstCCConverter * self, GstBuffer * inbuf,
in_fps_entry)) { in_fps_entry)) {
if (inbuf) if (inbuf)
gst_buffer_unmap (inbuf, &in); gst_buffer_unmap (inbuf, &in);
gst_buffer_set_size (outbuf, cc_data_len); goto drop;
return GST_FLOW_OK;
} }
if (inbuf) if (inbuf)
gst_buffer_unmap (inbuf, &in); gst_buffer_unmap (inbuf, &in);
gst_buffer_map (outbuf, &out, GST_MAP_WRITE);
if (!fit_and_scale_cc_data (self, in_fps_entry, out_fps_entry, ccp_data, if (!fit_and_scale_cc_data (self, in_fps_entry, out_fps_entry, ccp_data,
&ccp_data_len, cea608_1, &cea608_1_len, cea608_2, &cea608_2_len, &ccp_data_len, cea608_1, &cea608_1_len, cea608_2, &cea608_2_len,
tc_meta ? &tc_meta->tc : NULL)) tc_meta ? &tc_meta->tc : NULL))
@ -1790,14 +1785,14 @@ convert_cea708_cc_data_cea708_cdp (GstCCConverter * self, GstBuffer * inbuf,
&cc_data_len)) &cc_data_len))
goto drop; goto drop;
gst_buffer_map (outbuf, &out, GST_MAP_WRITE);
cc_data_len = cc_data_len =
convert_cea708_cc_data_cea708_cdp_internal (self, cc_data, cc_data_len, convert_cea708_cc_data_cea708_cdp_internal (self, cc_data, cc_data_len,
out.data, out.size, &self->current_output_timecode, out_fps_entry); out.data, out.size, &self->current_output_timecode, out_fps_entry);
self->output_frames++; self->output_frames++;
out:
gst_buffer_unmap (outbuf, &out); gst_buffer_unmap (outbuf, &out);
out:
gst_buffer_set_size (outbuf, cc_data_len); gst_buffer_set_size (outbuf, cc_data_len);
return GST_FLOW_OK; return GST_FLOW_OK;