mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-10 17:35:59 +00:00
Code Issues 1 Projects Releases Wiki Activity

flagset: Fail parsing on overflowing hex strings

Browse source 
This adds code to detect when the hex form of the string we are to
parse exceeds the number of bytes that would form a 32bit flag. This will
avoid treating as flagset anything above then the expected 32 bits and also
stop treading DRM format with modifiers as flagset (like
drm-format=AB24:0x0100000000000002).

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4775>
This commit is contained in:
Nicolas Dufresne 2023-06-05 12:21:22 -04:00 committed by GStreamer Marge Bot
parent 55926f0271
commit 343c42ca84
2 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
subprojects/gstreamer/gst/gstvalue.c
View file

@ -7900,6 +7900,16 @@ gst_value_deserialize_flagset (GValue * dest, const gchar * s)
if (G_UNLIKELY ((mask == 0 && errno == EINVAL) || cur == next)) if (G_UNLIKELY ((mask == 0 && errno == EINVAL) || cur == next))
goto try_as_flags_string; goto try_as_flags_string;
if (g_str_has_prefix (cur, "0x") || g_str_has_prefix (cur, "0X"))
cur += 2;
/* Flagsets are 32 bits hex numbers, so do not accept any number that has more
* then 8 characters. strtoul() accepts unlimited number of leading zeros and
* 64bit numbers on 64bit platforms.
*/
if ((next - cur) > 8)
return FALSE;
/* Next char should be NULL terminator, or a ':'. If ':', we need the flag string after */ /* Next char should be NULL terminator, or a ':'. If ':', we need the flag string after */
if (G_UNLIKELY (next[0] == 0)) { if (G_UNLIKELY (next[0] == 0)) {
res = TRUE; res = TRUE;

10
subprojects/gstreamer/tests/check/gst/gstvalue.c
View file

@ -773,6 +773,16 @@ GST_START_TEST (test_flagset)
g_value_unset (&dest); g_value_unset (&dest);
g_value_unset (&value); g_value_unset (&value);
g_value_unset (&value2); g_value_unset (&value2);
/* Check that we reject flagset looking string that holds 64 bit integers. */
g_value_init (&value, GST_TYPE_FLAG_SET);
string = g_strdup ("AB24:0x0100000000000002");
fail_if (gst_value_deserialize (&value, string),
"matched something that isn't a flagset %s", string);
g_free (string);
g_value_unset (&value);
} }
GST_END_TEST; GST_END_TEST;