From: Tim-Philipp Müller Date: Fri, 1 Jul 2016 11:20:14 +0000 (+0100) Subject: codecparsers: jpeg2000: don't allow 0 value for array access with i-1 X-Git-Tag: 1.10.4~515 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e92894e4ab344f8c0fa8ea69c231eaaee6b83ac8;p=platform%2Fupstream%2Fgst-plugins-bad.git codecparsers: jpeg2000: don't allow 0 value for array access with i-1 --- diff --git a/gst-libs/gst/codecparsers/gstjpeg2000sampling.c b/gst-libs/gst/codecparsers/gstjpeg2000sampling.c index edf885f..dba1c50 100644 --- a/gst-libs/gst/codecparsers/gstjpeg2000sampling.c +++ b/gst-libs/gst/codecparsers/gstjpeg2000sampling.c @@ -104,8 +104,10 @@ GstJPEG2000Colorspace gst_jpeg2000_colorspace_from_string (const gchar * colorspace_string) { GstJPEG2000Colorspace i; + g_return_val_if_fail (colorspace_string != NULL, GST_JPEG2000_COLORSPACE_NONE); + for (i = 0; i < G_N_ELEMENTS (gst_jpeg2000_colorspace_strings); ++i) { if (!g_strcmp0 (colorspace_string, gst_jpeg2000_colorspace_strings[i])) return (i + 1); @@ -117,7 +119,8 @@ gst_jpeg2000_colorspace_from_string (const gchar * colorspace_string) const gchar * 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); + return gst_jpeg2000_colorspace_strings[colorspace - 1]; }