Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-07 18:04:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset b6ebaaea0102 (bug 1741465) for causing bustages in IOUtils.cpp

Browse Source 
CLOSED TREE
This commit is contained in:
Alexandru Michis 2021-12-01 23:42:21 +02:00
parent 14114bef56
commit f236a62bde
3 changed files with 25 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dom/chrome-webidl/IOUtils.webidl
View File

@ -284,7 +284,7 @@ dictionary ReadOptions : ReadUTF8Options {
* The offset into the file to read from. If unspecified, the file will be read
* from the start.
*/
unsigned long long offset = 0;
unsigned long offset = 0;
/**
* The max bytes to read from the file at path. If unspecified, the entire

58
dom/system/IOUtils.cpp
View File

@ -829,7 +829,7 @@ already_AddRefed<Promise> IOUtils::CreateJSPromise(GlobalObject& aGlobal) {
/* static */
Result<IOUtils::JsBuffer, IOUtils::IOError> IOUtils::ReadSync(
nsIFile* aFile, const uint64_t aOffset, const Maybe<uint32_t> aMaxBytes,
nsIFile* aFile, const uint32_t aOffset, const Maybe<uint32_t> aMaxBytes,
const bool aDecompress, IOUtils::BufferKind aBufferKind) {
MOZ_ASSERT(!NS_IsMainThread());
@ -840,15 +840,6 @@ Result<IOUtils::JsBuffer, IOUtils::IOError> IOUtils::ReadSync(
"The `maxBytes` and `decompress` options are not compatible"));
}
if (aOffset > static_cast<uint64_t>(INT64_MAX)) {
return Err(IOError(NS_ERROR_ILLEGAL_INPUT)
.WithMessage("Requested offset is too large (%" PRIu64
" > %" PRId64 ")",
aOffset, INT64_MAX));
}
const int64_t offset = static_cast<int64_t>(aOffset);
RefPtr<nsFileStream> stream = new nsFileStream();
if (nsresult rv =
stream->Init(aFile, PR_RDONLY | nsIFile::OS_READAHEAD, 0666, 0);
@ -856,46 +847,43 @@ Result<IOUtils::JsBuffer, IOUtils::IOError> IOUtils::ReadSync(
return Err(IOError(rv).WithMessage("Could not open the file at %s",
aFile->HumanReadablePath().get()));
}
size_t bufSize = 0;
int64_t bufSize = 0;
if (aMaxBytes.isNothing()) {
// Limitation: We cannot read more than the maximum size of a TypedArray
// (UINT32_MAX bytes). Reject if we have been requested to
// perform too large of a read.
// Limitation: We cannot read files that are larger than the max size of a
// TypedArray (UINT32_MAX bytes). Reject if the file is too
// big to be read.
int64_t rawStreamSize = -1;
if (nsresult rv = stream->GetSize(&rawStreamSize); NS_FAILED(rv)) {
int64_t streamSize = -1;
if (nsresult rv = stream->GetSize(&streamSize); NS_FAILED(rv)) {
return Err(IOError(NS_ERROR_FILE_ACCESS_DENIED)
.WithMessage("Could not get info for the file at %s",
aFile->HumanReadablePath().get()));
}
MOZ_RELEASE_ASSERT(rawStreamSize >= 0);
MOZ_RELEASE_ASSERT(streamSize >= 0);
uint64_t streamSize = static_cast<uint64_t>(rawStreamSize);
if (aOffset >= rawStreamSize) {
if (streamSize > static_cast<int64_t>(UINT32_MAX)) {
return Err(
IOError(NS_ERROR_FILE_TOO_BIG)
.WithMessage("Could not read the file at %s because it is too "
"large(size=%" PRId64 " bytes)",
aFile->HumanReadablePath().get(), streamSize));
}
bufSize = static_cast<uint32_t>(streamSize);
if (aOffset >= bufSize) {
bufSize = 0;
} else {
streamSize -= offset;
if (streamSize > static_cast<int64_t>(UINT32_MAX)) {
return Err(IOError(NS_ERROR_FILE_TOO_BIG)
.WithMessage(
"Could not read the file at %s with offset %" PRIu32
" because it is too large(size=%" PRId64 " bytes)",
aFile->HumanReadablePath().get(), offset,
streamSize));
}
bufSize = static_cast<size_t>(streamSize);
bufSize = bufSize - aOffset;
}
} else {
bufSize = static_cast<size_t>(aMaxBytes.value());
bufSize = aMaxBytes.value();
}
if (offset > 0) {
if (nsresult rv = stream->Seek(PR_SEEK_SET, offset); NS_FAILED(rv)) {
if (aOffset > 0) {
if (nsresult rv = stream->Seek(PR_SEEK_SET, aOffset); NS_FAILED(rv)) {
return Err(IOError(rv).WithMessage(
"Could not seek to position %" PRId64 " in file %s", offset,
"Could not seek to position %" PRId64 " in file %s", aOffset,
aFile->HumanReadablePath().get()));
}
}

2
dom/system/IOUtils.h
View File

@ -197,7 +197,7 @@ class IOUtils final {
* error.
*/
static Result<JsBuffer, IOError> ReadSync(nsIFile* aFile,
const uint64_t aOffset,
const uint32_t aOffset,
const Maybe<uint32_t> aMaxBytes,
const bool aDecompress,
BufferKind aBufferKind);