Title: [243139] trunk/Tools
- Revision
- 243139
- Author
- [email protected]
- Date
- 2019-03-19 07:48:49 -0700 (Tue, 19 Mar 2019)
Log Message
[GStreamer][EME] Backported mssdemux protection data crash fix
https://bugs.webkit.org/show_bug.cgi?id=195918
Reviewed by Philippe Normand.
* gstreamer/jhbuild.modules:
* gstreamer/patches/gst-plugins-bad-0005-mssdemux-fix-protection-data-double-free.patch: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/Tools/ChangeLog (243138 => 243139)
--- trunk/Tools/ChangeLog 2019-03-19 14:38:45 UTC (rev 243138)
+++ trunk/Tools/ChangeLog 2019-03-19 14:48:49 UTC (rev 243139)
@@ -1,3 +1,13 @@
+2019-03-19 Xabier Rodriguez Calvar <[email protected]>
+
+ [GStreamer][EME] Backported mssdemux protection data crash fix
+ https://bugs.webkit.org/show_bug.cgi?id=195918
+
+ Reviewed by Philippe Normand.
+
+ * gstreamer/jhbuild.modules:
+ * gstreamer/patches/gst-plugins-bad-0005-mssdemux-fix-protection-data-double-free.patch: Added.
+
2019-03-19 Michael Catanzaro <[email protected]>
Unreviewed, rolling out r243132.
Modified: trunk/Tools/gstreamer/jhbuild.modules (243138 => 243139)
--- trunk/Tools/gstreamer/jhbuild.modules 2019-03-19 14:38:45 UTC (rev 243138)
+++ trunk/Tools/gstreamer/jhbuild.modules 2019-03-19 14:48:49 UTC (rev 243139)
@@ -106,6 +106,7 @@
<patch file="gst-plugins-bad-0002-aomenc-Handle-8-bit_depth-images-with-AOM_IMG_FMT_HI.patch" strip="1" /> <!-- Merged as 10a37e0c3528a721084441c37af37baef0908ddc (to be shipped in 1.16) -->
<patch file="gst-plugins-bad-0003-fdkaacenc-Remove-MODE_2_1.patch" strip="1" /> <!-- Merged as f4fdb9770c76113f38515245fecc5f11b3ace20d (to be shipped in 1.14.5) -->
<patch file="gst-plugins-bad-0004-fdkaacdec-Use-WAV-channel-mapping-instead-of-interleave-setting.patch" strip="1" /> <!-- Merged as 19d34f6b5e1633d5ec4bb2832c58470f0c829cab (to be shipped in 1.14.5) -->
+ <patch file="gst-plugins-bad-0005-mssdemux-fix-protection-data-double-free.patch" strip="1" /> <!-- Merged as 7c136bbb5ee34dfc1a0b003f5db351f1986106a0 (to be shipped in 1.14.5) -->
</branch>
</autotools>
Added: trunk/Tools/gstreamer/patches/gst-plugins-bad-0005-mssdemux-fix-protection-data-double-free.patch (0 => 243139)
--- trunk/Tools/gstreamer/patches/gst-plugins-bad-0005-mssdemux-fix-protection-data-double-free.patch (rev 0)
+++ trunk/Tools/gstreamer/patches/gst-plugins-bad-0005-mssdemux-fix-protection-data-double-free.patch 2019-03-19 14:48:49 UTC (rev 243139)
@@ -0,0 +1,27 @@
+From 7c136bbb5ee34dfc1a0b003f5db351f1986106a0 Mon Sep 17 00:00:00 2001
+From: Xabier Rodriguez Calvar <[email protected]>
+Date: Mon, 18 Mar 2019 15:23:07 +0100
+Subject: [PATCH] mssdemux: fix protection data double free
+
+For not being duplicated here it was being freed when the manifest was
+being destroyed and a second time when the buffer was being destroyed.
+---
+ ext/smoothstreaming/gstmssdemux.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ext/smoothstreaming/gstmssdemux.c b/ext/smoothstreaming/gstmssdemux.c
+index 85f0ec89a..bcea8ca07 100644
+--- a/ext/smoothstreaming/gstmssdemux.c
++++ b/ext/smoothstreaming/gstmssdemux.c
+@@ -489,7 +489,7 @@ gst_mss_demux_setup_streams (GstAdaptiveDemux * demux)
+
+ if (protected) {
+ GstBuffer *protection_buffer =
+- gst_buffer_new_wrapped ((gpointer) protection_data,
++ gst_buffer_new_wrapped (g_strdup (protection_data),
+ strlen (protection_data));
+ GstEvent *event =
+ gst_event_new_protection (protection_system_id, protection_buffer,
+--
+2.20.1
+
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
