From d8ed703cdb8b97c89aaa6a5f6eab0c9998d8f1a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20P=C3=B6lsterl?= <marduk@k-d-w.org>
Date: Thu, 16 Oct 2008 08:17:59 +0000
Subject: gst/mpegdemux/mpegtspacketizer.c: Fixes segfault in
 get_encoding_and_convert.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Original commit message from CVS:
patch by: Sebastian Pölsterl
* gst/mpegdemux/mpegtspacketizer.c:
Fixes segfault in get_encoding_and_convert.
Fixes #556482
---
 ChangeLog                        | 8 ++++++++
 gst/mpegdemux/mpegtspacketizer.c | 3 +++
 2 files changed, 11 insertions(+)

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) {
-- 
cgit v1.2.1