<!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>[286231] branches/safari-612-branch</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/286231">286231</a></dd>
<dt>Author</dt> <dd>repstein@apple.com</dd>
<dt>Date</dt> <dd>2021-11-29 11:37:43 -0800 (Mon, 29 Nov 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Cherry-pick <a href="http://trac.webkit.org/projects/webkit/changeset/284434">r284434</a>. rdar://problem/77969801

    WebM with invalid size should fail to load with error
    https://bugs.webkit.org/show_bug.cgi?id=231886
    rdar://77969801

    Reviewed by Jer Noble.

    Source/WebCore:

    libwebm for some elements are using a std::string or a std::vector<uint8_t>
    to store their content. Those have infallible memory allocators.
    We limit the size we allow the parser to use to some reasonable values.

    Test: media/media-webm-invalid-check.html

    * platform/graphics/cocoa/SourceBufferParserWebM.cpp:
    (WebCore::SourceBufferParserWebM::OnElementBegin):

    LayoutTests:

    * media/content/invalid-size.webm: Added.
    * media/media-webm-invalid-check-expected.txt: Added.
    * media/media-webm-invalid-check.html: Added.

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@284434 268f45cc-cd09-0410-ab3c-d52691b4dbfc</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari612branchLayoutTestsChangeLog">branches/safari-612-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari612branchSourceWebCoreChangeLog">branches/safari-612-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari612branchSourceWebCoreplatformgraphicscocoaSourceBufferParserWebMcpp">branches/safari-612-branch/Source/WebCore/platform/graphics/cocoa/SourceBufferParserWebM.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari612branchLayoutTestsmediacontentinvalidsizewebm">branches/safari-612-branch/LayoutTests/media/content/invalid-size.webm</a></li>
<li><a href="#branchessafari612branchLayoutTestsmediamediawebminvalidcheckexpectedtxt">branches/safari-612-branch/LayoutTests/media/media-webm-invalid-check-expected.txt</a></li>
<li><a href="#branchessafari612branchLayoutTestsmediamediawebminvalidcheckhtml">branches/safari-612-branch/LayoutTests/media/media-webm-invalid-check.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari612branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-612-branch/LayoutTests/ChangeLog (286230 => 286231)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/LayoutTests/ChangeLog 2021-11-29 19:37:39 UTC (rev 286230)
+++ branches/safari-612-branch/LayoutTests/ChangeLog    2021-11-29 19:37:43 UTC (rev 286231)
</span><span class="lines">@@ -1,3 +1,45 @@
</span><ins>+2021-11-11  Alan Coon  <alancoon@apple.com>
+
+        Cherry-pick r284434. rdar://problem/77969801
+
+    WebM with invalid size should fail to load with error
+    https://bugs.webkit.org/show_bug.cgi?id=231886
+    rdar://77969801
+    
+    Reviewed by Jer Noble.
+    
+    Source/WebCore:
+    
+    libwebm for some elements are using a std::string or a std::vector<uint8_t>
+    to store their content. Those have infallible memory allocators.
+    We limit the size we allow the parser to use to some reasonable values.
+    
+    Test: media/media-webm-invalid-check.html
+    
+    * platform/graphics/cocoa/SourceBufferParserWebM.cpp:
+    (WebCore::SourceBufferParserWebM::OnElementBegin):
+    
+    LayoutTests:
+    
+    * media/content/invalid-size.webm: Added.
+    * media/media-webm-invalid-check-expected.txt: Added.
+    * media/media-webm-invalid-check.html: Added.
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@284434 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-10-18  Jean-Yves Avenard  <jya@apple.com>
+
+            WebM with invalid size should fail to load with error
+            https://bugs.webkit.org/show_bug.cgi?id=231886
+            rdar://77969801
+
+            Reviewed by Jer Noble.
+
+            * media/content/invalid-size.webm: Added.
+            * media/media-webm-invalid-check-expected.txt: Added.
+            * media/media-webm-invalid-check.html: Added.
+
</ins><span class="cx"> 2021-11-09  Alan Coon  <alancoon@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Cherry-pick r285389. rdar://problem/84380291
</span></span></pre></div>
<a id="branchessafari612branchLayoutTestsmediacontentinvalidsizewebm"></a>
<div class="addfile"><h4>Added: branches/safari-612-branch/LayoutTests/media/content/invalid-size.webm (0 => 286231)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/LayoutTests/media/content/invalid-size.webm                           (rev 0)
+++ branches/safari-612-branch/LayoutTests/media/content/invalid-size.webm      2021-11-29 19:37:43 UTC (rev 286231)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+Eߣ\xFFB\x82AAAAAA\xC0t]@\xFF\xFFw\x80\xBBS\xACM\x9Bt\x8DM\xBB\xF9\xFB\xFF\xFF\x86a\x86a\x86\xACI\xA9f\x88*Ա
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari612branchLayoutTestsmediamediawebminvalidcheckexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-612-branch/LayoutTests/media/media-webm-invalid-check-expected.txt (0 => 286231)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/LayoutTests/media/media-webm-invalid-check-expected.txt                               (rev 0)
+++ branches/safari-612-branch/LayoutTests/media/media-webm-invalid-check-expected.txt  2021-11-29 19:37:43 UTC (rev 286231)
</span><span class="lines">@@ -0,0 +1,6 @@
</span><ins>+
+RUN(video.src = "content/invalid-size.webm")
+EVENT(error)
+Properly failed to load media OK
+END OF TEST
+
</ins></span></pre></div>
<a id="branchessafari612branchLayoutTestsmediamediawebminvalidcheckhtml"></a>
<div class="addfile"><h4>Added: branches/safari-612-branch/LayoutTests/media/media-webm-invalid-check.html (0 => 286231)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/LayoutTests/media/media-webm-invalid-check.html                               (rev 0)
+++ branches/safari-612-branch/LayoutTests/media/media-webm-invalid-check.html  2021-11-29 19:37:43 UTC (rev 286231)
</span><span class="lines">@@ -0,0 +1,24 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+    <title>media-webm-no-duration</title>
+    <script src="../media/video-test.js"></script>
+    <script>
+    window.addEventListener('load', async event => {
+        try {
+            window.video = document.querySelector('video');
+            run('video.src = "content/invalid-size.webm"');
+            waitFor(video, 'error').then(e => {
+                passTest('Properly failed to load media');
+                endTest();
+            });
+        } catch(e) {
+            failTest(e);
+        }
+    });
+    </script>
+</head>
+<body>
+    <video controls></video>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari612branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-612-branch/Source/WebCore/ChangeLog (286230 => 286231)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/Source/WebCore/ChangeLog      2021-11-29 19:37:39 UTC (rev 286230)
+++ branches/safari-612-branch/Source/WebCore/ChangeLog 2021-11-29 19:37:43 UTC (rev 286231)
</span><span class="lines">@@ -1,3 +1,50 @@
</span><ins>+2021-11-11  Alan Coon  <alancoon@apple.com>
+
+        Cherry-pick r284434. rdar://problem/77969801
+
+    WebM with invalid size should fail to load with error
+    https://bugs.webkit.org/show_bug.cgi?id=231886
+    rdar://77969801
+    
+    Reviewed by Jer Noble.
+    
+    Source/WebCore:
+    
+    libwebm for some elements are using a std::string or a std::vector<uint8_t>
+    to store their content. Those have infallible memory allocators.
+    We limit the size we allow the parser to use to some reasonable values.
+    
+    Test: media/media-webm-invalid-check.html
+    
+    * platform/graphics/cocoa/SourceBufferParserWebM.cpp:
+    (WebCore::SourceBufferParserWebM::OnElementBegin):
+    
+    LayoutTests:
+    
+    * media/content/invalid-size.webm: Added.
+    * media/media-webm-invalid-check-expected.txt: Added.
+    * media/media-webm-invalid-check.html: Added.
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@284434 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-10-18  Jean-Yves Avenard  <jya@apple.com>
+
+            WebM with invalid size should fail to load with error
+            https://bugs.webkit.org/show_bug.cgi?id=231886
+            rdar://77969801
+
+            Reviewed by Jer Noble.
+
+            libwebm for some elements are using a std::string or a std::vector<uint8_t>
+            to store their content. Those have infallible memory allocators.
+            We limit the size we allow the parser to use to some reasonable values.
+
+            Test: media/media-webm-invalid-check.html
+
+            * platform/graphics/cocoa/SourceBufferParserWebM.cpp:
+            (WebCore::SourceBufferParserWebM::OnElementBegin):
+
</ins><span class="cx"> 2021-11-08  Kocsen Chung  <kocsen_chung@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Cherry-pick r285236. rdar://problem/83950623
</span></span></pre></div>
<a id="branchessafari612branchSourceWebCoreplatformgraphicscocoaSourceBufferParserWebMcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-612-branch/Source/WebCore/platform/graphics/cocoa/SourceBufferParserWebM.cpp (286230 => 286231)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/Source/WebCore/platform/graphics/cocoa/SourceBufferParserWebM.cpp     2021-11-29 19:37:39 UTC (rev 286230)
+++ branches/safari-612-branch/Source/WebCore/platform/graphics/cocoa/SourceBufferParserWebM.cpp        2021-11-29 19:37:43 UTC (rev 286231)
</span><span class="lines">@@ -834,6 +834,39 @@
</span><span class="cx"> 
</span><span class="cx">     INFO_LOG_IF_POSSIBLE(LOGIDENTIFIER, "state(", oldState, "->", m_state, "), id(", metadata.id, "), position(", metadata.position, "), headerSize(", metadata.header_size, "), size(", metadata.size, ")");
</span><span class="cx"> 
</span><ins>+    // Apply some sanity check; libwebm::StringParser will read the content into a std::string and ByteParser into a std::vector
+    std::optional<size_t> maxElementSizeAllowed;
+    switch (metadata.id) {
+    case Id::kChapterStringUid:
+    case Id::kChapString:
+    case Id::kChapLanguage:
+    case Id::kChapCountry:
+    case Id::kDocType:
+    case Id::kTitle:
+    case Id::kMuxingApp:
+    case Id::kWritingApp:
+    case Id::kTagName:
+    case Id::kTagLanguage:
+    case Id::kTagString:
+    case Id::kTargetType:
+    case Id::kName:
+    case Id::kLanguage:
+    case Id::kCodecId:
+    case Id::kCodecName:
+        maxElementSizeAllowed = 1 * 1024 * 1024; // 1MiB
+        break;
+    case Id::kBlockAdditional:
+    case Id::kContentEncKeyId:
+    case Id::kProjectionPrivate:
+    case Id::kTagBinary:
+        maxElementSizeAllowed = 16 * 1024 * 1024; // 16MiB
+        break;
+    default:
+        break;
+    }
+    if (maxElementSizeAllowed && metadata.size >= *maxElementSizeAllowed)
+        return Status(Status::kNotEnoughMemory);
+
</ins><span class="cx">     return Status(Status::kOkCompleted);
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>