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: avoid overflows when doing int operations for size

Browse source 
size is a gsize, so cast the operands to it to avoid overflows
and setting wrong value to the video size.

Includes tests.

https://bugzilla.gnome.org/show_bug.cgi?id=731195
This commit is contained in:
Thiago Santos 2014-06-09 19:44:56 -03:00
parent 8810ada4cd
commit fb3a9d1bc5
2 changed files with 45 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gst-libs/gst/video/video-info.c
View file

@ -373,10 +373,10 @@ gst_video_info_to_caps (GstVideoInfo * info)
static int static int
fill_planes (GstVideoInfo * info) fill_planes (GstVideoInfo * info)
{ {
gint width, height; gsize width, height;
width = info->width; width = (gsize) info->width;
height = info->height; height = (gsize) info->height;
switch (info->finfo->format) { switch (info->finfo->format) {
case GST_VIDEO_FORMAT_YUY2: case GST_VIDEO_FORMAT_YUY2:
@ -627,7 +627,8 @@ gst_video_info_convert (GstVideoInfo * info,
GstFormat dest_format, gint64 * dest_value) GstFormat dest_format, gint64 * dest_value)
{ {
gboolean ret = FALSE; gboolean ret = FALSE;
int size, fps_n, fps_d; int fps_n, fps_d;
gsize size;
g_return_val_if_fail (info != NULL, 0); g_return_val_if_fail (info != NULL, 0);
g_return_val_if_fail (info->finfo != NULL, 0); g_return_val_if_fail (info->finfo != NULL, 0);
@ -657,7 +658,7 @@ gst_video_info_convert (GstVideoInfo * info,
/* bytes to frames */ /* bytes to frames */
if (src_format == GST_FORMAT_BYTES && dest_format == GST_FORMAT_DEFAULT) { if (src_format == GST_FORMAT_BYTES && dest_format == GST_FORMAT_DEFAULT) {
if (size != 0) { if (size != 0) {
*dest_value = gst_util_uint64_scale_int (src_value, 1, size); *dest_value = gst_util_uint64_scale (src_value, 1, size);
} else { } else {
GST_ERROR ("blocksize is 0"); GST_ERROR ("blocksize is 0");
*dest_value = 0; *dest_value = 0;
@ -668,7 +669,7 @@ gst_video_info_convert (GstVideoInfo * info,
/* frames to bytes */ /* frames to bytes */
if (src_format == GST_FORMAT_DEFAULT && dest_format == GST_FORMAT_BYTES) { if (src_format == GST_FORMAT_DEFAULT && dest_format == GST_FORMAT_BYTES) {
*dest_value = gst_util_uint64_scale_int (src_value, size, 1); *dest_value = gst_util_uint64_scale (src_value, size, 1);
ret = TRUE; ret = TRUE;
goto done; goto done;
} }

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

@ -641,6 +641,43 @@ GST_START_TEST (test_video_formats_rgb)
GST_END_TEST; GST_END_TEST;
GST_START_TEST (test_video_formats_rgba_large_dimension)
{
GstVideoInfo vinfo;
gint width, height, framerate_n, framerate_d, par_n, par_d;
GstCaps *caps;
GstStructure *structure;
gst_video_info_init (&vinfo);
gst_video_info_set_format (&vinfo, GST_VIDEO_FORMAT_RGBA, 29700, 21000);
vinfo.par_n = 1;
vinfo.par_d = 1;
vinfo.fps_n = 0;
vinfo.fps_d = 1;
caps = gst_video_info_to_caps (&vinfo);
structure = gst_caps_get_structure (caps, 0);
fail_unless (gst_structure_get_int (structure, "width", &width));
fail_unless (gst_structure_get_int (structure, "height", &height));
fail_unless (gst_structure_get_fraction (structure, "framerate", &framerate_n,
&framerate_d));
fail_unless (gst_structure_get_fraction (structure, "pixel-aspect-ratio",
&par_n, &par_d));
fail_unless (width == 29700);
fail_unless (height == 21000);
fail_unless (framerate_n == 0);
fail_unless (framerate_d == 1);
fail_unless (par_n == 1);
fail_unless (par_d == 1);
fail_unless (vinfo.size == (gsize) 29700 * 21000 * 4);
gst_caps_unref (caps);
}
GST_END_TEST;
GST_START_TEST (test_dar_calc) GST_START_TEST (test_dar_calc)
{ {
guint display_ratio_n, display_ratio_d; guint display_ratio_n, display_ratio_d;
@ -1665,6 +1702,7 @@ video_suite (void)
suite_add_tcase (s, tc_chain); suite_add_tcase (s, tc_chain);
tcase_add_test (tc_chain, test_video_formats); tcase_add_test (tc_chain, test_video_formats);
tcase_add_test (tc_chain, test_video_formats_rgb); 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); tcase_add_test (tc_chain, test_video_formats_all);
tcase_add_test (tc_chain, test_video_formats_pack_unpack); tcase_add_test (tc_chain, test_video_formats_pack_unpack);
tcase_add_test (tc_chain, test_dar_calc); tcase_add_test (tc_chain, test_dar_calc);