mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-17 11:45:25 +00:00
Code Issues 1 Projects Releases Wiki Activity

interlace: Store unsigned integers in unsigned integer types

Browse source 
And add some assertions to guard against overflows and out of bounds
reads.
This commit is contained in:
Sebastian Dröge 2019-12-03 15:45:26 +02:00 committed by GStreamer Merge Bot
parent c67146b27a
commit 812d593c4e
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
gst/interlace/gstinterlace.c
View file

@ -98,11 +98,11 @@ struct _GstInterlace
int src_fps_d; int src_fps_d;
GstBuffer *stored_frame; GstBuffer *stored_frame;
gint stored_fields; guint stored_fields;
gint phase_index; guint phase_index;
int field_index; /* index of the next field to push, 0=top 1=bottom */ guint field_index; /* index of the next field to push, 0=top 1=bottom */
GstClockTime timebase; GstClockTime timebase;
int fields_since_timebase; guint fields_since_timebase;
guint pattern_offset; /* initial offset into the pattern */ guint pattern_offset; /* initial offset into the pattern */
gboolean passthrough; gboolean passthrough;
}; };
@ -849,7 +849,7 @@ gst_interlace_chain (GstPad * pad, GstObject * parent, GstBuffer * buffer)
GstInterlace *interlace = GST_INTERLACE (parent); GstInterlace *interlace = GST_INTERLACE (parent);
GstFlowReturn ret = GST_FLOW_OK; GstFlowReturn ret = GST_FLOW_OK;
gint num_fields = 0; gint num_fields = 0;
int current_fields; guint current_fields;
const PulldownFormat *format; const PulldownFormat *format;
GstClockTime timestamp; GstClockTime timestamp;
@ -902,6 +902,7 @@ gst_interlace_chain (GstPad * pad, GstObject * parent, GstBuffer * buffer)
current_fields = format->n_fields[interlace->phase_index]; current_fields = format->n_fields[interlace->phase_index];
/* increment the phase index */ /* increment the phase index */
interlace->phase_index++; interlace->phase_index++;
g_assert (interlace->phase_index < G_N_ELEMENTS (format->n_fields));
if (!format->n_fields[interlace->phase_index]) { if (!format->n_fields[interlace->phase_index]) {
interlace->phase_index = 0; interlace->phase_index = 0;
} }
@ -911,7 +912,7 @@ gst_interlace_chain (GstPad * pad, GstObject * parent, GstBuffer * buffer)
num_fields = interlace->stored_fields + current_fields; num_fields = interlace->stored_fields + current_fields;
while (num_fields >= 2) { while (num_fields >= 2) {
GstBuffer *output_buffer; GstBuffer *output_buffer;
int n_output_fields; guint n_output_fields;
gboolean interlaced = FALSE; gboolean interlaced = FALSE;
GST_DEBUG ("have %d fields, %d current, %d stored", GST_DEBUG ("have %d fields, %d current, %d stored",
@ -948,6 +949,9 @@ gst_interlace_chain (GstPad * pad, GstObject * parent, GstBuffer * buffer)
gst_interlace_decorate_buffer (interlace, output_buffer, n_output_fields, gst_interlace_decorate_buffer (interlace, output_buffer, n_output_fields,
interlaced); interlaced);
/* Guard against overflows here. If this ever happens, resetting the phase
* above would never happen because of some bugs */
g_assert (interlace->fields_since_timebase <= G_MAXUINT - n_output_fields);
interlace->fields_since_timebase += n_output_fields; interlace->fields_since_timebase += n_output_fields;
interlace->field_index ^= (n_output_fields & 1); interlace->field_index ^= (n_output_fields & 1);