gst/gstvalue.c: revert last patch, only dom a g_utf8_validate now before accepting the string - caps parsing strips "...
Original commit message from CVS:
* gst/gstvalue.c: (gst_value_deserialize_string):
revert last patch, only dom a g_utf8_validate now before accepting
the string - caps parsing strips " from strings so we can't rely on
them
* testsuite/caps/value_serialize.c: (test_string_deserialization):
disable a test that tested the above and comment it
diff --git a/ChangeLog b/ChangeLog
index 31dad5a..74e4c31 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-12-17 Benjamin Otte <in7y118@public.uni-hamburg.de>
+
+ * gst/gstvalue.c: (gst_value_deserialize_string):
+ revert last patch, only dom a g_utf8_validate now before accepting
+ the string - caps parsing strips " from strings so we can't rely on
+ them
+ * testsuite/caps/value_serialize.c: (test_string_deserialization):
+ disable a test that tested the above and comment it
+
2004-12-16 David Schleef <ds@schleef.org>
* win32/gstenumtypes.c: Update from gst/gstenumtypes.c (See
diff --git a/gst/gstvalue.c b/gst/gstvalue.c
index 1f8549c..526110f 100644
--- a/gst/gstvalue.c
+++ b/gst/gstvalue.c
@@ -1332,11 +1332,7 @@
gst_value_deserialize_string (GValue * dest, const char *s)
{
if (*s != '"') {
- const gchar *t = s;
-
- while (GST_ASCII_IS_STRING (*t))
- t++;
- if (!*t == '\0')
+ if (!g_utf8_validate (s, -1, NULL))
return FALSE;
g_value_set_string (dest, s);
return TRUE;
diff --git a/tests/old/testsuite/caps/value_serialize.c b/tests/old/testsuite/caps/value_serialize.c
index b698004..c621568 100644
--- a/tests/old/testsuite/caps/value_serialize.c
+++ b/tests/old/testsuite/caps/value_serialize.c
@@ -76,8 +76,11 @@
"\"\\0\"", NULL}, /* unfinished escaped character */
{
"\" \"", NULL}, /* spaces must be escaped */
+#if 0
+ /* FIXME 0.9: this test should fail, but it doesn't */
{
"tüüt", NULL} /* string with special chars must be escaped */
+#endif
};
guint i;
GValue v = { 0, };
diff --git a/testsuite/caps/value_serialize.c b/testsuite/caps/value_serialize.c
index b698004..c621568 100644
--- a/testsuite/caps/value_serialize.c
+++ b/testsuite/caps/value_serialize.c
@@ -76,8 +76,11 @@
"\"\\0\"", NULL}, /* unfinished escaped character */
{
"\" \"", NULL}, /* spaces must be escaped */
+#if 0
+ /* FIXME 0.9: this test should fail, but it doesn't */
{
"tüüt", NULL} /* string with special chars must be escaped */
+#endif
};
guint i;
GValue v = { 0, };
