corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1869371 - Move IOUtils::ReadSync option errors to frontend r=nika

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D196653
This commit is contained in:
Barret Rennie
2024-02-07 03:24:49 +00:00
parent 371ab7d7ca
commit e33437c996
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
dom/system/IOUtils.cpp
View File

@@ -361,6 +361,15 @@ already_AddRefed<Promise> IOUtils::Read(GlobalObject& aGlobal,
Maybe<uint32_t> toRead = Nothing();
if (!aOptions.mMaxBytes.IsNull()) {
if (aOptions.mDecompress) {
RejectJSPromise(
promise, IOError(NS_ERROR_ILLEGAL_INPUT,
"Could not read `%s': the `maxBytes' and "
"`decompress' options are mutually exclusive",
file->HumanReadablePath().get()));
return;
}
if (aOptions.mMaxBytes.Value() == 0) {
// Resolve with an empty buffer.
nsTArray<uint8_t> arr(0);
@@ -1232,13 +1241,9 @@ Result<IOUtils::JsBuffer, IOUtils::IOError> IOUtils::ReadSync(
nsIFile* aFile, const uint64_t aOffset, const Maybe<uint32_t> aMaxBytes,
const bool aDecompress, IOUtils::BufferKind aBufferKind) {
MOZ_ASSERT(!NS_IsMainThread());
if (aMaxBytes.isSome() && aDecompress) {
return Err(IOError(NS_ERROR_ILLEGAL_INPUT,
"Could not read `%s': the `maxBytes' and `decompress' "
"options are mutually exclusive",
aFile->HumanReadablePath().get()));
}
// This is checked in IOUtils::Read.
MOZ_ASSERT(aMaxBytes.isNothing() || !aDecompress,
"maxBytes and decompress are mutually exclusive");
if (aOffset > static_cast<uint64_t>(INT64_MAX)) {
return Err(