check/gst/gstvalue.c (test_string): Add test for bug #165650.

Original commit message from CVS:
2005-11-19  Andy Wingo  <wingo@pobox.com>

* check/gst/gstvalue.c (test_string): Add test for bug #165650.

* gst/gstvalue.c (gst_string_wrap): Trying to serialize a NULL
string should produce an error, given the lack of a way to
represent NULL strings. Fixes #165650.

diff --git a/ChangeLog b/ChangeLog
index 878c06557d5f7157127af6ed1fc21ebc1f2153c4..28251fa1fb3c812eb50f30fb5934db57fd235265 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2005-11-19  Andy Wingo  <wingo@pobox.com>
 
+       * check/gst/gstvalue.c (test_string): Add test for bug #165650.
+
+       * gst/gstvalue.c (gst_string_wrap): Trying to serialize a NULL
+       string should produce an error, given the lack of a way to
+       represent NULL strings. Fixes #165650.
+       
        * gst/gstvalue.h: 
        * gst/gstvalue.c (gst_value_array_append_value) 
        (gst_value_array_prepend_value, gst_value_array_get_size) 

diff --git a/check/gst/gstvalue.c b/check/gst/gstvalue.c
index 9e109e8568b37163652d7ccaca855acf57107da0..6683a4234955adc02b2b87efaeb79ee21ce2ee75 100644 (file)
--- a/check/gst/gstvalue.c
+++ b/check/gst/gstvalue.c
@@ -256,6 +256,9 @@ GST_START_TEST (test_string)
         "\nserialized  : %s\ndeserialized: %s", try[i],
         g_value_get_string (&v));
   }
+  /* NULL strings should not be serializable */
+  g_value_set_string (&v, NULL);
+  fail_unless (gst_value_serialize (&v) == NULL);
   g_value_unset (&v);
 }
 

diff --git a/gst/gstvalue.c b/gst/gstvalue.c
index 74361b751452d2005be03b4f042e354806eccc43..1e5e6b92e07041935eb12d6e21e7f8029a49d657 100644 (file)
--- a/gst/gstvalue.c
+++ b/gst/gstvalue.c
@@ -1381,7 +1381,7 @@ gst_string_wrap (const char *s)
   len = 0;
   t = s;
   if (!s)
-    return g_strdup ("");
+    return NULL;
   while (*t) {
     if (GST_ASCII_IS_STRING (*t)) {
       len++;

diff --git a/tests/check/gst/gstvalue.c b/tests/check/gst/gstvalue.c
index 9e109e8568b37163652d7ccaca855acf57107da0..6683a4234955adc02b2b87efaeb79ee21ce2ee75 100644 (file)
--- a/tests/check/gst/gstvalue.c
+++ b/tests/check/gst/gstvalue.c
@@ -256,6 +256,9 @@ GST_START_TEST (test_string)
         "\nserialized  : %s\ndeserialized: %s", try[i],
         g_value_get_string (&v));
   }
+  /* NULL strings should not be serializable */
+  g_value_set_string (&v, NULL);
+  fail_unless (gst_value_serialize (&v) == NULL);
   g_value_unset (&v);
 }