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

v4l2bufferpool: Early catch short allocation

Browse source 
Catch short allocation after saving the format. This is not a catch all, but should catch
most of the miss-behaving drivers when doing S_FMT/G_FMT and avoid potential crash.
This commit is contained in:
Nicolas Dufresne 2014-04-09 12:53:19 -04:00
parent 2b0ac06ade
commit db3d2f35f0
1 changed files with 22 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
sys/v4l2/gstv4l2object.c
View file

@ -2623,6 +2623,9 @@ gst_v4l2_object_set_format (GstV4l2Object * v4l2object, GstCaps * caps)
done:
gst_v4l2_object_save_format (v4l2object, fmtdesc, &format, &info, &align);
if (v4l2object->sizeimage < GST_VIDEO_INFO_SIZE (&info))
goto short_allocation;
/* now configure the pool */
if (!gst_v4l2_object_setup_pool (v4l2object, caps))
goto pool_failed;
@ -2707,6 +2710,14 @@ set_parm_failed:
GST_ERROR_SYSTEM);
goto done;
}
short_allocation:
{
GST_ELEMENT_ERROR (v4l2object->element, RESOURCE, SETTINGS,
(_("Video device provided a image size that is too short.")),
("Expected at least %" G_GSIZE_FORMAT " but got %u", info.size,
v4l2object->sizeimage));
return FALSE;
}
pool_failed:
{
/* setup_pool already send the error */
@ -2789,6 +2800,9 @@ gst_v4l2_object_acquire_format (GstV4l2Object * v4l2object, GstVideoInfo * info)
gst_v4l2_object_save_format (v4l2object, fmtdesc, &fmt, info, &align);
if (v4l2object->sizeimage < GST_VIDEO_INFO_SIZE (info))
goto short_allocation;
/* Shall we setup the pool ? */
return TRUE;
@ -2822,6 +2836,14 @@ unsupported_format:
GST_FOURCC_ARGS (fmt.fmt.pix.pixelformat)));
return FALSE;
}
short_allocation:
{
GST_ELEMENT_ERROR (v4l2object->element, RESOURCE, SETTINGS,
(_("Video device provided a image size that is too short.")),
("Expected at least %" G_GSIZE_FORMAT " but got %u", info->size,
v4l2object->sizeimage));
return FALSE;
}
}
gboolean