loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid infinite recursion if cache file modified underneath cache

Browse Source 
This generalizes our "does file still exist" check to also check
that the file is the expected length. If it's not, we don't trust
it. This avoids infinite recursion in CacheDataSource if a cache
file is truncated underneath the cache.

Issue: #6165
PiperOrigin-RevId: 265707928
This commit is contained in:
olly 2019-08-27 18:05:41 +01:00 committed by Oliver Woodman
parent aa6ead3d08
commit 0a0ab8d5e7
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java vendored
View File

@ -697,9 +697,9 @@ public final class SimpleCache implements Cache {
} }
while (true) { while (true) {
SimpleCacheSpan span = cachedContent.getSpan(position); SimpleCacheSpan span = cachedContent.getSpan(position);
if (span.isCached && !span.file.exists()) { if (span.isCached && span.file.length() != span.length) {
// The file has been deleted from under us. It's likely that other files will have been // The file has been modified or deleted underneath us. It's likely that other files will
// deleted too, so scan the whole in-memory representation. // have been modified too, so scan the whole in-memory representation.
removeStaleSpans(); removeStaleSpans();
continue; continue;
} }
@ -739,14 +739,14 @@ public final class SimpleCache implements Cache {
} }
/** /**
* Scans all of the cached spans in the in-memory representation, removing any for which files no * Scans all of the cached spans in the in-memory representation, removing any for which the
* longer exist. * underlying file lengths no longer match.
*/ */
private void removeStaleSpans() { private void removeStaleSpans() {
ArrayList<CacheSpan> spansToBeRemoved = new ArrayList<>(); ArrayList<CacheSpan> spansToBeRemoved = new ArrayList<>();
for (CachedContent cachedContent : contentIndex.getAll()) { for (CachedContent cachedContent : contentIndex.getAll()) {
for (CacheSpan span : cachedContent.getSpans()) { for (CacheSpan span : cachedContent.getSpans()) {
if (!span.file.exists()) { if (span.file.length() != span.length) {
spansToBeRemoved.add(span); spansToBeRemoved.add(span);
} }
} }