# HG changeset patch
# User Jean-Yves Avenard <jyavenard@mozilla.com>
# Date 1460655260 25200
# Node ID a13c0bc84d6eb132f4199f563fbe228d2d3b3a51
# Parent  88f1eb2c3f4b4b57365ed88223cf8adc2bec4610
Bug 1254721: Ensure consistency between Cenc offsets and sizes table. r=gerald a=sylvestre

MozReview-Commit-ID: E1KbKIIBR87

diff --git a/media/libstagefright/frameworks/av/media/libstagefright/SampleTable.cpp b/media/libstagefright/frameworks/av/media/libstagefright/SampleTable.cpp
--- a/media/libstagefright/frameworks/av/media/libstagefright/SampleTable.cpp
+++ b/media/libstagefright/frameworks/av/media/libstagefright/SampleTable.cpp
@@ -612,18 +612,18 @@ status_t
 SampleTable::parseSampleCencInfo() {
     if ((!mCencDefaultSize && !mCencInfoCount) || mCencOffsets.isEmpty()) {
         // We don't have all the cenc information we need yet. Quietly fail and
         // hope we get the data we need later in the track header.
         ALOGV("Got half of cenc saio/saiz pair. Deferring parse until we get the other half.");
         return OK;
     }
 
-    if (!mCencSizes.isEmpty() && mCencOffsets.size() > 1 &&
-        mCencSizes.size() != mCencOffsets.size()) {
+    if ((mCencOffsets.size() > 1 && mCencOffsets.size() < mCencInfoCount) ||
+        (!mCencDefaultSize && mCencSizes.size() < mCencInfoCount)) {
         return ERROR_MALFORMED;
     }
 
     if (mCencInfoCount > kMAX_ALLOCATION / sizeof(SampleCencInfo)) {
         // Avoid future OOM.
         return ERROR_MALFORMED;
     }
 

cm?id=23af19f964910548233537f4d6d47789c3abc8ab'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/build/linux-container.scm'>
<input type='hidden' name='id' value='23af19f964910548233537f4d6d47789c3abc8ab'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=23af19f964910548233537f4d6d47789c3abc8ab'>root</a>/<a href='/guix/log/gnu?id=23af19f964910548233537f4d6d47789c3abc8ab'>gnu</a>/<a href='/guix/log/gnu/build?id=23af19f964910548233537f4d6d47789c3abc8ab'>build</a>/<a href='/guix/log/gnu/build/linux-container.scm?id=23af19f964910548233537f4d6d47789c3abc8ab'>linux-container.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/build/linux-container.scm?id=23af19f964910548233537f4d6d47789c3abc8ab&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-12-06 21:55:18 +0100'>2020-12-06</span></td><td><a href='/guix/commit/gnu/build/linux-container.scm?id=329fa5bdbb621dae586cbfb062cbd3b295880ba5'>Revert "linux-container: Correct test for unprivileged user namespace support."</a><span class='msg-avail'>...<span class='msg-tooltip'>This broke 'guix environment --container' on non-Debian distributions.
Fixes &lt;https://bugs.gnu.org/45066&gt;.  Reported by luhux &lt;luhux@outlook.com&gt;.

This reverts commit 8bc5ca5160db3d82bd5b6b2b7ed80c96f42bd33e.
</span></span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2020-12-03 16:25:45 +0000'>2020-12-03</span></td><td><a href='/guix/commit/gnu/build/linux-container.scm?id=8bc5ca5160db3d82bd5b6b2b7ed80c96f42bd33e'>linux-container: Correct test for unprivileged user namespace support.</a><span class='msg-avail'>...<span class='msg-tooltip'>Fixes &lt;https://bugs.gnu.org/31977&gt;.
Reported by Paul Garlick &lt;pgarlick@tourbillion-technology.com&gt;.

* gnu/build/linux-container.scm (unprivileged-user-namespace-supported?):
Return #f when the 'userns-file' does not exist.
</span></span></td><td>Paul Garlick</td></tr>
<tr><td><span title='2020-10-01 12:51:13 +0200'>2020-10-01</span></td><td><a href='/guix/commit/gnu/build/linux-container.scm?id=e74818353882f187e5971b5a3a481f17df883dbe'>linux-container: Reset jailed root permissions.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/build/linux-container.scm (mount-file-systems): Add 'chmod' call.
* tests/containers.scm
("call-with-container, mnt namespace, root permissions"): New test.
</span></span></td><td>Jelle Licht</td></tr>
<tr><td><span title='2020-09-10 09:38:52 +0200'>2020-09-10</span></td><td><a href='/guix/commit/gnu/build/linux-container.scm?id=b3a83f1ece4b6c8bfcc2a9875df51142c0e39904'>build: linux-container: Fix run-container.</a><span class='msg-avail'>...<span class='msg-tooltip'>This is a follow-up of 5316dfc0f125b658e4a2acf7f00f49501663d943. Some users of
run-container may expect that the container is jailed, even if there are no
mounts. This is the case for some Guix tests.

* gnu/build/linux-container.scm (run-container): Do not jail the container
when the requested root is "/".
</span></span></td><td>Mathieu Othacehe</td></tr>
<tr><td><span title='2020-09-02 17:05:23 +0200'>2020-09-02</span></td><td><a href='/guix/commit/gnu/build/linux-container.scm?id=5316dfc0f125b658e4a2acf7f00f49501663d943'>linux-container: Do not jail the container unconditionally.</a><span class='msg-avail'>...<span class='msg-tooltip'>We may want to run a container inside the MNT namespace, without jailing the
container. If RUN-CONTAINER is passed a null MOUNTS list, do not jail the
container.

* gnu/build/linux-container.scm (run-container): Do not call
MOUNT-FILE-SYSTEMS if MOUNTS list is empty.
</span></span></td><td>Mathieu Othacehe</td></tr>