diff options
| author | Sebastian Dröge <sebastian@centricular.com> | 2016-11-24 15:40:22 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2016-11-24 15:40:22 +0200 |
| commit | 47fdb15074fb4bebf20bf63f857b82d784b96919 (patch) | |
| tree | 6e38ce62a92894cfc34fc3679cc0f16f3e841452 | |
| parent | 3d7a5666402d7c911303ebf718cf003eccffded5 (diff) | |
video-info: Add unit test for overflow checks
And also prevent overflows caused by allowing uint width/height in
gst_video_info_set_format() but storing them as (signed!) ints.
| -rw-r--r-- | gst-libs/gst/video/video-info.c | 3 | ||||
| -rw-r--r-- | tests/check/libs/video.c | 42 |
2 files changed, 45 insertions, 0 deletions
diff --git a/gst-libs/gst/video/video-info.c b/gst-libs/gst/video/video-info.c index f569d492a..9227b9f9c 100644 --- a/gst-libs/gst/video/video-info.c +++ b/gst-libs/gst/video/video-info.c @@ -216,6 +216,9 @@ gst_video_info_set_format (GstVideoInfo * info, GstVideoFormat format, g_return_val_if_fail (info != NULL, FALSE); g_return_val_if_fail (format != GST_VIDEO_FORMAT_UNKNOWN, FALSE); + if (width > G_MAXINT || height > G_MAXINT) + return FALSE; + gst_video_info_init (info); info->finfo = gst_video_format_get_info (format); diff --git a/tests/check/libs/video.c b/tests/check/libs/video.c index 0f62cd885..8462c008b 100644 --- a/tests/check/libs/video.c +++ b/tests/check/libs/video.c @@ -612,6 +612,47 @@ GST_START_TEST (test_video_formats) GST_END_TEST; +GST_START_TEST (test_video_formats_overflow) +{ + GstVideoInfo vinfo; + + gst_video_info_init (&vinfo); + + fail_unless (gst_video_info_set_format (&vinfo, GST_VIDEO_FORMAT_ARGB, 32768, + 32767)); + /* fails due to simplification: we forbid some things that would in theory be fine. + * We assume a 128 byte alignment for the width currently + * fail_unless (gst_video_info_set_format (&vinfo, GST_VIDEO_FORMAT_ARGB, 32767, 32768)); + */ + fail_if (gst_video_info_set_format (&vinfo, GST_VIDEO_FORMAT_ARGB, 32768, + 32768)); + + fail_if (gst_video_info_set_format (&vinfo, GST_VIDEO_FORMAT_ARGB, + G_MAXINT / 2, G_MAXINT)); + fail_if (gst_video_info_set_format (&vinfo, GST_VIDEO_FORMAT_ARGB, G_MAXINT, + G_MAXINT / 2)); + fail_if (gst_video_info_set_format (&vinfo, GST_VIDEO_FORMAT_ARGB, + G_MAXINT / 2, G_MAXINT / 2)); + fail_if (gst_video_info_set_format (&vinfo, GST_VIDEO_FORMAT_ARGB, G_MAXINT, + G_MAXINT)); + fail_if (gst_video_info_set_format (&vinfo, GST_VIDEO_FORMAT_ARGB, + G_MAXUINT / 2, G_MAXUINT)); + fail_if (gst_video_info_set_format (&vinfo, GST_VIDEO_FORMAT_ARGB, G_MAXUINT, + G_MAXUINT / 2)); + fail_if (gst_video_info_set_format (&vinfo, GST_VIDEO_FORMAT_ARGB, + G_MAXUINT / 2, G_MAXUINT / 2)); + fail_if (gst_video_info_set_format (&vinfo, GST_VIDEO_FORMAT_ARGB, G_MAXUINT, + G_MAXUINT)); + + fail_unless (gst_video_info_set_format (&vinfo, GST_VIDEO_FORMAT_ARGB, + 1073741824 - 128, 1)); + fail_if (gst_video_info_set_format (&vinfo, GST_VIDEO_FORMAT_ARGB, 1073741824, + 1)); + +} + +GST_END_TEST; + GST_START_TEST (test_video_formats_rgb) { GstVideoInfo vinfo; @@ -2757,6 +2798,7 @@ video_suite (void) suite_add_tcase (s, tc_chain); tcase_add_test (tc_chain, test_video_formats); + tcase_add_test (tc_chain, test_video_formats_overflow); tcase_add_test (tc_chain, test_video_formats_rgb); tcase_add_test (tc_chain, test_video_formats_rgba_large_dimension); tcase_add_test (tc_chain, test_video_formats_all); |