summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--gst/mpegdemux/mpegtspacketizer.c3
2 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index b428b3d2..6cefd99d 100644
--- 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 ce4a644a..a89236b5 100644
--- 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) {