Merge "Guard against negative sizes from codec"

This commit is contained in:
TreeHugger Robot
2021-09-24 22:00:15 +00:00
committed by Android (Google) Code Review

View File

@@ -140,7 +140,7 @@ static status_t decode(int fd, int64_t offset, int64_t length,
__func__);
break;
}
const size_t dataSize = std::min((size_t)info.size, available);
const size_t dataSize = std::min(available, (size_t)std::max(info.size, 0));
memcpy(writePos, buf + info.offset, dataSize);
writePos += dataSize;
written += dataSize;