codecparsers: jpeg2000: don't allow 0 value for array access with i-1

This commit is contained in:
Tim-Philipp Müller 2016-07-01 12:20:14 +01:00
parent 1462ac7cdf
commit e92894e4ab

View file

@ -104,8 +104,10 @@ GstJPEG2000Colorspace
gst_jpeg2000_colorspace_from_string (const gchar * colorspace_string) gst_jpeg2000_colorspace_from_string (const gchar * colorspace_string)
{ {
GstJPEG2000Colorspace i; GstJPEG2000Colorspace i;
g_return_val_if_fail (colorspace_string != NULL, g_return_val_if_fail (colorspace_string != NULL,
GST_JPEG2000_COLORSPACE_NONE); GST_JPEG2000_COLORSPACE_NONE);
for (i = 0; i < G_N_ELEMENTS (gst_jpeg2000_colorspace_strings); ++i) { for (i = 0; i < G_N_ELEMENTS (gst_jpeg2000_colorspace_strings); ++i) {
if (!g_strcmp0 (colorspace_string, gst_jpeg2000_colorspace_strings[i])) if (!g_strcmp0 (colorspace_string, gst_jpeg2000_colorspace_strings[i]))
return (i + 1); return (i + 1);
@ -117,7 +119,8 @@ gst_jpeg2000_colorspace_from_string (const gchar * colorspace_string)
const gchar * const gchar *
gst_jpeg2000_colorspace_to_string (GstJPEG2000Colorspace colorspace) gst_jpeg2000_colorspace_to_string (GstJPEG2000Colorspace colorspace)
{ {
g_return_val_if_fail (colorspace >= 0 g_return_val_if_fail (colorspace > GST_JPEG2000_COLORSPACE_NONE
&& colorspace <= G_N_ELEMENTS (gst_jpeg2000_colorspace_strings), NULL); && colorspace <= G_N_ELEMENTS (gst_jpeg2000_colorspace_strings), NULL);
return gst_jpeg2000_colorspace_strings[colorspace - 1]; return gst_jpeg2000_colorspace_strings[colorspace - 1];
} }