mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-25 01:30:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

structure: don't overread input when searching for "

Browse source 
When searching for the string terminator don't read past the ending
0-byte when escaping characters.
Add unit test for various escaping cases.
This commit is contained in:
Wim Taymans 2014-11-20 13:34:32 +01:00
parent d4c551a292
commit 5cf630697c
2 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gst/gststructure.c
View file

@ -1922,8 +1922,11 @@ gst_structure_parse_string (gchar * s, gchar ** end, gchar ** next,
while (*s != '"') { while (*s != '"') {
if (G_UNLIKELY (*s == 0)) if (G_UNLIKELY (*s == 0))
return FALSE; return FALSE;
if (G_UNLIKELY (*s == '\\')) if (G_UNLIKELY (*s == '\\')) {
s++; s++;
if (G_UNLIKELY (*s == 0))
return FALSE;
}
*w = *s; *w = *s;
w++; w++;
s++; s++;
@ -1935,8 +1938,11 @@ gst_structure_parse_string (gchar * s, gchar ** end, gchar ** next,
while (*s != '"') { while (*s != '"') {
if (G_UNLIKELY (*s == 0)) if (G_UNLIKELY (*s == 0))
return FALSE; return FALSE;
if (G_UNLIKELY (*s == '\\')) if (G_UNLIKELY (*s == '\\')) {
s++; s++;
if (G_UNLIKELY (*s == 0))
return FALSE;
}
s++; s++;
} }
s++; s++;

14
tests/check/gst/gststructure.c
View file

@ -174,6 +174,20 @@ GST_START_TEST (test_from_string)
ASSERT_WARNING (structure = gst_structure_from_string (s, NULL)); ASSERT_WARNING (structure = gst_structure_from_string (s, NULL));
fail_if (structure == NULL, "Could not get structure from string %s", s); fail_if (structure == NULL, "Could not get structure from string %s", s);
gst_structure_free (structure); gst_structure_free (structure);
/* make sure we handle \ as last character in various things, run with valgrind */
s = "foo,test=\"foobar\\";
structure = gst_structure_from_string (s, NULL);
fail_unless (structure == NULL);
s = "\\";
structure = gst_structure_from_string (s, NULL);
fail_unless (structure == NULL);
s = "foobar,test\\";
structure = gst_structure_from_string (s, NULL);
fail_unless (structure == NULL);
s = "foobar,test=(string)foo\\";
structure = gst_structure_from_string (s, NULL);
fail_unless (structure == NULL);
} }
GST_END_TEST; GST_END_TEST;