<!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>[286291] trunk/Source/WebCore</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/286291">286291</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2021-11-30 04:49:19 -0800 (Tue, 30 Nov 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/269103">r269103</a>): this patch is not EME spec compliant
https://bugs.webkit.org/show_bug.cgi?id=233630

Unreviewed, revert <a href="http://trac.webkit.org/projects/webkit/changeset/269103">r269103</a>. We must validate init data.

Patch by Philippe Normand <pnormand@igalia.com> on 2021-11-30

* Modules/encryptedmedia/CDM.cpp:
(WebCore::CDM::sanitizeInitData):
* platform/encryptedmedia/CDMPrivate.cpp:
(WebCore::CDMPrivate::sanitizeInitData const): Deleted.
* platform/encryptedmedia/CDMPrivate.h:
* platform/graphics/gstreamer/eme/CDMThunder.cpp:
(WebCore::CDMPrivateThunder::supportsInitData const):
(WebCore::CDMPrivateThunder::sanitizeInitData const): Deleted.
* platform/graphics/gstreamer/eme/CDMThunder.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesencryptedmediaCDMcpp">trunk/Source/WebCore/Modules/encryptedmedia/CDM.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformencryptedmediaCDMPrivatecpp">trunk/Source/WebCore/platform/encryptedmedia/CDMPrivate.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformencryptedmediaCDMPrivateh">trunk/Source/WebCore/platform/encryptedmedia/CDMPrivate.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreameremeCDMThundercpp">trunk/Source/WebCore/platform/graphics/gstreamer/eme/CDMThunder.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreameremeCDMThunderh">trunk/Source/WebCore/platform/graphics/gstreamer/eme/CDMThunder.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (286290 => 286291)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-11-30 11:47:24 UTC (rev 286290)
+++ trunk/Source/WebCore/ChangeLog      2021-11-30 12:49:19 UTC (rev 286291)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2021-11-30  Philippe Normand  <pnormand@igalia.com>
+
+        REGRESSION(r269103): this patch is not EME spec compliant
+        https://bugs.webkit.org/show_bug.cgi?id=233630
+
+        Unreviewed, revert r269103. We must validate init data.
+
+        * Modules/encryptedmedia/CDM.cpp:
+        (WebCore::CDM::sanitizeInitData):
+        * platform/encryptedmedia/CDMPrivate.cpp:
+        (WebCore::CDMPrivate::sanitizeInitData const): Deleted.
+        * platform/encryptedmedia/CDMPrivate.h:
+        * platform/graphics/gstreamer/eme/CDMThunder.cpp:
+        (WebCore::CDMPrivateThunder::supportsInitData const):
+        (WebCore::CDMPrivateThunder::sanitizeInitData const): Deleted.
+        * platform/graphics/gstreamer/eme/CDMThunder.h:
+
</ins><span class="cx"> 2021-11-30  Martin Robinson  <mrobinson@webkit.org>
</span><span class="cx"> 
</span><span class="cx">         Transition from perspective(500px) to 'none' is probably wrong
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesencryptedmediaCDMcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/encryptedmedia/CDM.cpp (286290 => 286291)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/encryptedmedia/CDM.cpp      2021-11-30 11:47:24 UTC (rev 286290)
+++ trunk/Source/WebCore/Modules/encryptedmedia/CDM.cpp 2021-11-30 12:49:19 UTC (rev 286291)
</span><span class="lines">@@ -137,9 +137,7 @@
</span><span class="cx"> 
</span><span class="cx"> RefPtr<SharedBuffer> CDM::sanitizeInitData(const AtomString& initDataType, const SharedBuffer& initData)
</span><span class="cx"> {
</span><del>-    if (!m_private)
-        return nullptr;
-    return m_private->sanitizeInitData(initDataType, initData);
</del><ins>+    return InitDataRegistry::shared().sanitizeInitData(initDataType, initData);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> bool CDM::supportsInitData(const AtomString& initDataType, const SharedBuffer& initData)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformencryptedmediaCDMPrivatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/encryptedmedia/CDMPrivate.cpp (286290 => 286291)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/encryptedmedia/CDMPrivate.cpp      2021-11-30 11:47:24 UTC (rev 286290)
+++ trunk/Source/WebCore/platform/encryptedmedia/CDMPrivate.cpp 2021-11-30 12:49:19 UTC (rev 286291)
</span><span class="lines">@@ -32,7 +32,6 @@
</span><span class="cx"> #include "CDMMediaCapability.h"
</span><span class="cx"> #include "CDMRequirement.h"
</span><span class="cx"> #include "CDMRestrictions.h"
</span><del>-#include "InitDataRegistry.h"
</del><span class="cx"> #include "MediaPlayer.h"
</span><span class="cx"> #include "NotImplemented.h"
</span><span class="cx"> #include "ParsedContentType.h"
</span><span class="lines">@@ -516,12 +515,7 @@
</span><span class="cx">     callback(ConsentStatus::Allowed, WTFMove(accumulatedConfiguration), WTFMove(restrictions));
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-RefPtr<SharedBuffer> CDMPrivate::sanitizeInitData(const AtomString& initDataType, const SharedBuffer& initData) const
-{
-    return InitDataRegistry::shared().sanitizeInitData(initDataType, initData);
-}
</del><span class="cx"> 
</span><del>-
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformencryptedmediaCDMPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/encryptedmedia/CDMPrivate.h (286290 => 286291)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/encryptedmedia/CDMPrivate.h        2021-11-30 11:47:24 UTC (rev 286290)
+++ trunk/Source/WebCore/platform/encryptedmedia/CDMPrivate.h   2021-11-30 12:49:19 UTC (rev 286291)
</span><span class="lines">@@ -74,7 +74,6 @@
</span><span class="cx">     virtual bool supportsServerCertificates() const = 0;
</span><span class="cx">     virtual bool supportsSessions() const = 0;
</span><span class="cx">     virtual bool supportsInitData(const AtomString&, const SharedBuffer&) const = 0;
</span><del>-    WEBCORE_EXPORT virtual RefPtr<SharedBuffer> sanitizeInitData(const AtomString& initDataType, const SharedBuffer& initData) const;
</del><span class="cx">     virtual RefPtr<SharedBuffer> sanitizeResponse(const SharedBuffer&) const = 0;
</span><span class="cx">     virtual std::optional<String> sanitizeSessionId(const String&) const = 0;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreameremeCDMThundercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/eme/CDMThunder.cpp (286290 => 286291)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/eme/CDMThunder.cpp      2021-11-30 11:47:24 UTC (rev 286290)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/eme/CDMThunder.cpp 2021-11-30 12:49:19 UTC (rev 286291)
</span><span class="lines">@@ -237,15 +237,6 @@
</span><span class="cx">     return false;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-RefPtr<SharedBuffer> CDMPrivateThunder::sanitizeInitData(const AtomString& initDataType, const SharedBuffer& initData) const
-{
-    // Validate the initData buffer as CENC initData. FIXME: Validate it is actually CENC.
-    if (equalLettersIgnoringASCIICase(initDataType, "cenc") && !initData.isEmpty())
-        return initData.copy();
-
-    return CDMPrivate::sanitizeInitData(initDataType, initData);
-}
-
</del><span class="cx"> RefPtr<SharedBuffer> CDMPrivateThunder::sanitizeResponse(const SharedBuffer& response) const
</span><span class="cx"> {
</span><span class="cx">     return response.copy();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreameremeCDMThunderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/eme/CDMThunder.h (286290 => 286291)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/eme/CDMThunder.h        2021-11-30 11:47:24 UTC (rev 286290)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/eme/CDMThunder.h   2021-11-30 12:49:19 UTC (rev 286291)
</span><span class="lines">@@ -94,7 +94,6 @@
</span><span class="cx">     bool supportsServerCertificates() const final;
</span><span class="cx">     bool supportsSessions() const final;
</span><span class="cx">     bool supportsInitData(const AtomString&, const SharedBuffer&) const final;
</span><del>-    RefPtr<SharedBuffer> sanitizeInitData(const AtomString& initDataType, const SharedBuffer& initData) const final;
</del><span class="cx">     RefPtr<SharedBuffer> sanitizeResponse(const SharedBuffer&) const final;
</span><span class="cx">     std::optional<String> sanitizeSessionId(const String&) const final;
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>