diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:14:29 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:14:29 +0000 |
| commit | fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8 (patch) | |
| tree | 4c1ccaf5486d4f2009f9a338a98a83e886e29c97 /dom/fs | |
| parent | Releasing progress-linux version 124.0.1-1~progress7.99u1. (diff) | |
| download | firefox-fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8.tar.xz firefox-fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8.zip | |
Merging upstream version 125.0.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'dom/fs')
| -rw-r--r-- | dom/fs/api/FileSystemDirectoryHandle.cpp | 4 | ||||
| -rw-r--r-- | dom/fs/api/FileSystemFileHandle.cpp | 2 | ||||
| -rw-r--r-- | dom/fs/api/FileSystemHandle.cpp | 2 | ||||
| -rw-r--r-- | dom/fs/child/FileSystemWritableFileStreamChild.h | 1 |
4 files changed, 5 insertions, 4 deletions
diff --git a/dom/fs/api/FileSystemDirectoryHandle.cpp b/dom/fs/api/FileSystemDirectoryHandle.cpp index 3529f29e78..bdc8185e3a 100644 --- a/dom/fs/api/FileSystemDirectoryHandle.cpp +++ b/dom/fs/api/FileSystemDirectoryHandle.cpp @@ -6,6 +6,8 @@ #include "FileSystemDirectoryHandle.h" +#include <cstdint> + #include "FileSystemDirectoryIteratorFactory.h" #include "fs/FileSystemRequestHandler.h" #include "js/StructuredClone.h" @@ -153,7 +155,7 @@ already_AddRefed<FileSystemDirectoryHandle> FileSystemDirectoryHandle::ReadStructuredClone( JSContext* aCx, nsIGlobalObject* aGlobal, JSStructuredCloneReader* aReader) { - uint32_t kind = static_cast<uint32_t>(FileSystemHandleKind::EndGuard_); + uint32_t kind = UINT32_MAX; if (!JS_ReadBytes(aReader, reinterpret_cast<void*>(&kind), sizeof(uint32_t))) { diff --git a/dom/fs/api/FileSystemFileHandle.cpp b/dom/fs/api/FileSystemFileHandle.cpp index 4d8306857f..83d2933af5 100644 --- a/dom/fs/api/FileSystemFileHandle.cpp +++ b/dom/fs/api/FileSystemFileHandle.cpp @@ -99,7 +99,7 @@ already_AddRefed<FileSystemFileHandle> FileSystemFileHandle::ReadStructuredClone(JSContext* aCx, nsIGlobalObject* aGlobal, JSStructuredCloneReader* aReader) { - uint32_t kind = static_cast<uint32_t>(FileSystemHandleKind::EndGuard_); + uint32_t kind = UINT32_MAX; if (!JS_ReadBytes(aReader, reinterpret_cast<void*>(&kind), sizeof(uint32_t))) { diff --git a/dom/fs/api/FileSystemHandle.cpp b/dom/fs/api/FileSystemHandle.cpp index d0accdea00..79151920c0 100644 --- a/dom/fs/api/FileSystemHandle.cpp +++ b/dom/fs/api/FileSystemHandle.cpp @@ -210,7 +210,7 @@ already_AddRefed<FileSystemHandle> FileSystemHandle::ReadStructuredClone( JSStructuredCloneReader* aReader) { LOG_VERBOSE(("Reading File/DirectoryHandle")); - uint32_t kind = static_cast<uint32_t>(FileSystemHandleKind::EndGuard_); + uint32_t kind = UINT32_MAX; if (!JS_ReadBytes(aReader, reinterpret_cast<void*>(&kind), sizeof(uint32_t))) { diff --git a/dom/fs/child/FileSystemWritableFileStreamChild.h b/dom/fs/child/FileSystemWritableFileStreamChild.h index 9728fc4c78..ec4ce4fdad 100644 --- a/dom/fs/child/FileSystemWritableFileStreamChild.h +++ b/dom/fs/child/FileSystemWritableFileStreamChild.h @@ -21,7 +21,6 @@ class FileSystemWritableFileStreamChild NS_INLINE_DECL_REFCOUNTING(FileSystemWritableFileStreamChild, override) FileSystemWritableFileStream* MutableWritableFileStreamPtr() const { - MOZ_ASSERT(mStream); return mStream; } |