gst/mpegdemux/mpegtspacketizer.c: Fixes segfault in get_encoding_and_convert.

Original commit message from CVS:
patch by: Sebastian Pölsterl
* gst/mpegdemux/mpegtspacketizer.c:
Fixes segfault in get_encoding_and_convert.
Fixes #556482

diff --git a/ChangeLog b/ChangeLog
index b428b3d..6cefd99 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-10-16  Zaheer Abbas Merali  <zaheerabbas at merali dot org>
+
+       patch by: Sebastian Pölsterl
+       
+       * gst/mpegdemux/mpegtspacketizer.c:
+       Fixes segfault in get_encoding_and_convert.
+       Fixes #556482
+
 2008-10-15  Zaheer Abbas Merali  <zaheerabbas at merali dot org>
 
        patch by: Josep Torra

diff --git a/gst/mpegdemux/mpegtspacketizer.c b/gst/mpegdemux/mpegtspacketizer.c
index ce4a644..a89236b 100644 (file)
--- a/gst/mpegdemux/mpegtspacketizer.c
+++ b/gst/mpegdemux/mpegtspacketizer.c
@@ -2213,6 +2213,9 @@ get_encoding_and_convert (const gchar * text, guint length)
 
   g_return_val_if_fail (text != NULL, NULL);
 
+  if (length == 0)
+    return g_strdup ("");
+
   encoding = get_encoding (text, &start_text, &is_multibyte);
 
   if (encoding == NULL) {