mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 04:01:08 +00:00
Code Issues 1 Projects Releases Wiki Activity

video-converter: Guard against invalid frame input

Browse source 
If the frames passed in to gst_video_converter_frame()
have a different layout than was configured for, the
conversion code might go out of bounds and crash.

Do a sanity check on each frame passed in, and in the
absence of a return value in the API, just
refuse the conversion in invalid cases and leave the
destination frame untouched so it's obvious to
users that it was broken.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/696>
This commit is contained in:
Jan Schmidt 2020-06-05 23:34:44 +10:00 committed by GStreamer Merge Bot
parent b4bdb75a80
commit bf5d51c5da
2 changed files with 30 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
gst-libs/gst/video/video-converter.c
View file

@ -2674,6 +2674,27 @@ gst_video_converter_frame (GstVideoConverter * convert,
g_return_if_fail (src != NULL);
g_return_if_fail (dest != NULL);
/* Check the frames we've been passed match the layout
* we were configured for or we might go out of bounds */
if (G_UNLIKELY (GST_VIDEO_INFO_FORMAT (&convert->in_info) !=
GST_VIDEO_FRAME_FORMAT (src)
|| GST_VIDEO_INFO_WIDTH (&convert->in_info) !=
GST_VIDEO_FRAME_WIDTH (src)
|| GST_VIDEO_INFO_HEIGHT (&convert->in_info) !=
GST_VIDEO_FRAME_HEIGHT (src))) {
g_critical ("Input video frame does not match configuration");
return;
}
if (G_UNLIKELY (GST_VIDEO_INFO_FORMAT (&convert->out_info) !=
GST_VIDEO_FRAME_FORMAT (dest)
|| GST_VIDEO_INFO_WIDTH (&convert->out_info) !=
GST_VIDEO_FRAME_WIDTH (dest)
|| GST_VIDEO_INFO_HEIGHT (&convert->out_info) !=
GST_VIDEO_FRAME_HEIGHT (dest))) {
g_critical ("Output video frame does not match configuration");
return;
}
convert->convert (convert, src, dest);
}

9
tests/check/libs/video.c
View file

@ -2683,6 +2683,15 @@ GST_START_TEST (test_video_convert)
GST_VIDEO_CONVERTER_OPT_DEST_HEIGHT, G_TYPE_INT, 230, NULL));
gst_video_converter_frame (convert, &inframe, &outframe);
/* Check that video convert doesn't crash if we give it frames with different info
* than we configured it with by swapping width/height */
gst_video_frame_unmap (&inframe);
fail_unless (gst_video_info_set_format (&ininfo, GST_VIDEO_FORMAT_ARGB, 240,
320));
gst_video_frame_map (&inframe, &ininfo, inbuffer, GST_MAP_READ);
ASSERT_CRITICAL (gst_video_converter_frame (convert, &inframe, &outframe));
gst_video_converter_free (convert);
gst_video_frame_unmap (&outframe);