Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Clamp reads at the beginning too.

Browse source 
Safer, avoids an index overrun in disk cache.
This commit is contained in:
Unknown W. Brackets 2016-05-26 00:07:07 -07:00
parent 1c357f7f7b
commit 8dd7527dc8
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Core/FileLoaders/CachingFileLoader.cpp
View file

@ -68,6 +68,12 @@ void CachingFileLoader::Seek(s64 absolutePos) {
}
size_t CachingFileLoader::ReadAt(s64 absolutePos, size_t bytes, void *data) {
if (absolutePos >= filesize_) {
bytes = 0;
} else if (absolutePos + (s64)bytes >= filesize_) {
bytes = filesize_ - absolutePos;
}
size_t readSize = ReadFromCache(absolutePos, bytes, data);
// While in case the cache size is too small for the entire read.
while (readSize < bytes) {

6
Core/FileLoaders/DiskCachingFileLoader.cpp
View file

@ -76,6 +76,12 @@ void DiskCachingFileLoader::Seek(s64 absolutePos) {
size_t DiskCachingFileLoader::ReadAt(s64 absolutePos, size_t bytes, void *data) {
size_t readSize;
if (absolutePos >= filesize_) {
bytes = 0;
} else if (absolutePos + (s64)bytes >= filesize_) {
bytes = filesize_ - absolutePos;
}
if (cache_ && cache_->IsValid()) {
readSize = cache_->ReadFromCache(absolutePos, bytes, data);
// While in case the cache size is too small for the entire read.