mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-18 15:51:11 +00:00
Code Issues 1 Projects Releases Wiki Activity

libs: display: when appending formats change pointers to indexes

Browse source 
Thus, it fixes an invalid read when YV12 or I420 are not supported by
the driver.

https://bugzilla.gnome.org/show_bug.cgi?id=785085
This commit is contained in:
Tomas Rataj 2017-07-27 10:54:00 +00:00 committed by Víctor Manuel Jáquez Leal
parent aa3543929b
commit c181308904
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
gst-libs/gst/vaapi/gstvaapidisplay.c
View file

@ -209,13 +209,13 @@ append_formats (GArray * formats, const VAImageFormat * va_formats,
guint * flags, guint n)
{
GstVideoFormat format;
const GstVaapiFormatInfo *YV12_fip = NULL;
const GstVaapiFormatInfo *I420_fip = NULL;
int YV12_idx = -1;
int I420_idx = -1;
const GstVaapiFormatInfo *fip;
guint i;
for (i = 0; i < n; i++) {
const VAImageFormat *const va_format = &va_formats[i];
const GstVaapiFormatInfo **fipp;
format = gst_vaapi_video_format_from_va_format (va_format);
if (format == GST_VIDEO_FORMAT_UNKNOWN) {
@ -227,25 +227,25 @@ append_formats (GArray * formats, const VAImageFormat * va_formats,
switch (format) {
case GST_VIDEO_FORMAT_YV12:
fipp = &YV12_fip;
YV12_idx = formats->len - 1;
break;
case GST_VIDEO_FORMAT_I420:
fipp = &I420_fip;
I420_idx = formats->len - 1;
break;
default:
fipp = NULL;
break;
}
if (fipp)
*fipp = &g_array_index (formats, GstVaapiFormatInfo, formats->len - 1);
}
/* Append I420 (resp. YV12) format if YV12 (resp. I420) is not
supported by the underlying driver */
if (YV12_fip && !I420_fip)
append_format (formats, GST_VIDEO_FORMAT_I420, YV12_fip->flags);
else if (I420_fip && !YV12_fip)
append_format (formats, GST_VIDEO_FORMAT_YV12, I420_fip->flags);
if ((YV12_idx != -1) && (I420_idx == -1)) {
fip = &g_array_index (formats, GstVaapiFormatInfo, YV12_idx);
append_format (formats, GST_VIDEO_FORMAT_I420, fip->flags);
} else if ((I420_idx != -1) && (YV12_idx == -1)) {
fip = &g_array_index (formats, GstVaapiFormatInfo, I420_idx);
append_format (formats, GST_VIDEO_FORMAT_YV12, fip->flags);
}
}
/* Sort image formats. Prefer YUV formats first */