<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[243139] trunk/Tools</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/243139">243139</a></dd>
<dt>Author</dt> <dd>calvaris@igalia.com</dd>
<dt>Date</dt> <dd>2019-03-19 07:48:49 -0700 (Tue, 19 Mar 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>[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.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsgstreamerjhbuildmodules">trunk/Tools/gstreamer/jhbuild.modules</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkToolsgstreamerpatchesgstpluginsbad0005mssdemuxfixprotectiondatadoublefreepatch">trunk/Tools/gstreamer/patches/gst-plugins-bad-0005-mssdemux-fix-protection-data-double-free.patch</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (243138 => 243139)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2019-03-19 14:38:45 UTC (rev 243138)
+++ trunk/Tools/ChangeLog       2019-03-19 14:48:49 UTC (rev 243139)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2019-03-19  Xabier Rodriguez Calvar  <calvaris@igalia.com>
+
+        [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.
+
</ins><span class="cx"> 2019-03-19  Michael Catanzaro  <mcatanzaro@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         Unreviewed, rolling out r243132.
</span></span></pre></div>
<a id="trunkToolsgstreamerjhbuildmodules"></a>
<div class="modfile"><h4>Modified: trunk/Tools/gstreamer/jhbuild.modules (243138 => 243139)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -106,6 +106,7 @@
</span><span class="cx">       <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) -->
</span><span class="cx">       <patch file="gst-plugins-bad-0003-fdkaacenc-Remove-MODE_2_1.patch" strip="1" /> <!-- Merged as f4fdb9770c76113f38515245fecc5f11b3ace20d (to be shipped in 1.14.5) -->
</span><span class="cx">       <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) -->
</span><ins>+      <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) -->
</ins><span class="cx">     </branch>
</span><span class="cx">   </autotools>
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkToolsgstreamerpatchesgstpluginsbad0005mssdemuxfixprotectiondatadoublefreepatch"></a>
<div class="addfile"><h4>Added: trunk/Tools/gstreamer/patches/gst-plugins-bad-0005-mssdemux-fix-protection-data-double-free.patch (0 => 243139)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,27 @@
</span><ins>+From 7c136bbb5ee34dfc1a0b003f5db351f1986106a0 Mon Sep 17 00:00:00 2001
+From: Xabier Rodriguez Calvar <calvaris@igalia.com>
+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
+
</ins></span></pre>
</div>
</div>

</body>
</html>