Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Justin Kim
gst-plugins-bad
Commits
62d6f5c7
Commit
62d6f5c7
authored
Aug 29, 2017
by
Edward Hervey
Committed by
Edward Hervey
Aug 29, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
tsdemux: Properly error out on jp2k parsing errors
Avoids crashes later on where we assume buffer exists
parent
63c582d6
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
0 deletions
+8
-0
gst/mpegtsdemux/tsdemux.c
gst/mpegtsdemux/tsdemux.c
+8
-0
No files found.
gst/mpegtsdemux/tsdemux.c
View file @
62d6f5c7
...
...
@@ -2842,6 +2842,10 @@ gst_ts_demux_push_pending_data (GstTSDemux * demux, TSDemuxStream * stream,
}
}
else
if
(
bs
->
stream_type
==
GST_MPEGTS_STREAM_TYPE_VIDEO_JP2K
)
{
buffer
=
parse_jp2k_access_unit
(
stream
);
if
(
!
buffer
)
{
res
=
GST_FLOW_ERROR
;
goto
beach
;
}
}
else
{
buffer
=
gst_buffer_new_wrapped
(
stream
->
data
,
stream
->
current_size
);
}
...
...
@@ -2878,6 +2882,10 @@ gst_ts_demux_push_pending_data (GstTSDemux * demux, TSDemuxStream * stream,
}
}
else
if
(
bs
->
stream_type
==
GST_MPEGTS_STREAM_TYPE_VIDEO_JP2K
)
{
buffer
=
parse_jp2k_access_unit
(
stream
);
if
(
!
buffer
)
{
res
=
GST_FLOW_ERROR
;
goto
beach
;
}
}
else
{
buffer
=
gst_buffer_new_wrapped
(
stream
->
data
,
stream
->
current_size
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment