mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-03-03 10:21:11 +00:00
Code Issues 1 Projects Releases Wiki Activity

codecparsers: jpeg2000: fix possible out-of-bounds array access

Browse source 
sizeof(array) != G_N_ELEMENTS(array).

CID 1362900
This commit is contained in:
Tim-Philipp Müller 2016-07-01 12:15:28 +01:00
parent 659032b3d9
commit 1462ac7cdf
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gst-libs/gst/codecparsers/gstjpeg2000sampling.c
View file

@ -46,7 +46,7 @@ gst_jpeg2000_sampling_from_string (const gchar * sampling_string)
{ {
GstJPEG2000Sampling i; GstJPEG2000Sampling i;
g_return_val_if_fail (sampling_string != NULL, GST_JPEG2000_SAMPLING_NONE); g_return_val_if_fail (sampling_string != NULL, GST_JPEG2000_SAMPLING_NONE);
for (i = 0; i < sizeof (gst_jpeg2000_sampling_strings); ++i) { for (i = 0; i < G_N_ELEMENTS (gst_jpeg2000_sampling_strings); ++i) {
if (!g_strcmp0 (sampling_string, gst_jpeg2000_sampling_strings[i])) if (!g_strcmp0 (sampling_string, gst_jpeg2000_sampling_strings[i]))
return (i + 1); return (i + 1);
} }
@ -60,7 +60,7 @@ const gchar *
gst_jpeg2000_sampling_to_string (GstJPEG2000Sampling sampling) gst_jpeg2000_sampling_to_string (GstJPEG2000Sampling sampling)
{ {
g_return_val_if_fail (sampling > 0 g_return_val_if_fail (sampling > 0
&& sampling <= sizeof (gst_jpeg2000_sampling_strings), NULL); && sampling <= G_N_ELEMENTS (gst_jpeg2000_sampling_strings), NULL);
return gst_jpeg2000_sampling_strings[sampling - 1]; return gst_jpeg2000_sampling_strings[sampling - 1];
} }
@ -106,7 +106,7 @@ 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 < sizeof (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);
} }
@ -118,6 +118,6 @@ 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 >= 0
&& colorspace <= sizeof (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];
} }