From b3d300bc26f05e0e2efaa59a2f240125d0cbfef5 Mon Sep 17 00:00:00 2001 From: David Svensson Fors Date: Mon, 7 Feb 2022 09:30:58 +0100 Subject: [PATCH] codec-utils: Avoid out-of-bounds error For artificial input (in unit tests), all six bytes of constraint_indicator_flags in hevc_caps_get_mime_codec() can be zero. Add a guard against an out-of-bounds error that occurred in that case. Change variables to signed int so comparison with -1 works. Part-of: --- subprojects/gst-plugins-base/gst-libs/gst/pbutils/codec-utils.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/subprojects/gst-plugins-base/gst-libs/gst/pbutils/codec-utils.c b/subprojects/gst-plugins-base/gst-libs/gst/pbutils/codec-utils.c index cb1cea4..78bdb7a 100644 --- a/subprojects/gst-plugins-base/gst-libs/gst/pbutils/codec-utils.c +++ b/subprojects/gst-plugins-base/gst-libs/gst/pbutils/codec-utils.c @@ -2380,7 +2380,7 @@ hevc_caps_get_mime_codec (GstCaps * caps, gchar ** mime_codec) guint32 compat_flag_parameter = 0; GString *codec_string; const guint8 *profile_tier_level; - unsigned last_flag_index; + gint last_flag_index; caps_st = gst_caps_get_structure (caps, 0); codec_data_value = gst_structure_get_value (caps_st, "codec_data"); @@ -2447,9 +2447,10 @@ hevc_caps_get_mime_codec (GstCaps * caps, gchar ** mime_codec) * of each byte separated by a period; trailing bytes that are zero may be omitted. */ last_flag_index = 5; - while ((int) (constraint_indicator_flags[last_flag_index]) == 0) + while (last_flag_index >= 0 + && (int) (constraint_indicator_flags[last_flag_index]) == 0) --last_flag_index; - for (unsigned i = 0; i <= last_flag_index; ++i) { + for (gint i = 0; i <= last_flag_index; ++i) { g_string_append_printf (codec_string, ".%02X", constraint_indicator_flags[i]); } -- 2.7.4