wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-30 12:27:29 +09:00
Code Issues Projects Releases Packages Wiki Activity

Split aData into smaller chunks to avoid going over the IPC message size limit (1335989).

Browse source
This commit is contained in:
Fedor 2021-07-30 17:05:04 +03:00 • committed by roytam1
commit e84c7ab0c3
6 changed files with 32 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
ipc/glue/IPCMessageUtils.h
View file

@ -385,6 +385,18 @@ struct ParamTraits<nsLiteralCString> : ParamTraits<nsACString>
typedef nsLiteralCString paramType; typedef nsLiteralCString paramType;
}; };
template <>
struct ParamTraits<nsDependentSubstring> : ParamTraits<nsAString>
{
typedef nsDependentSubstring paramType;
};
template <>
struct ParamTraits<nsDependentCSubstring> : ParamTraits<nsACString>
{
typedef nsDependentCSubstring paramType;
};
#ifdef MOZILLA_INTERNAL_API #ifdef MOZILLA_INTERNAL_API
template<> template<>

2
ipc/ipdl/ipdl/builtin.py
View file

@ -36,6 +36,8 @@ Types = (
'nsresult', 'nsresult',
'nsString', 'nsString',
'nsCString', 'nsCString',
'nsDependentSubstring',
'nsDependentCSubstring',
'mozilla::ipc::Shmem', 'mozilla::ipc::Shmem',
'mozilla::ipc::FileDescriptor' 'mozilla::ipc::FileDescriptor'
) )

2
netwerk/protocol/wyciwyg/PWyciwygChannel.ipdl
View file

@ -35,7 +35,7 @@ parent:
async AppData(SerializedLoadContext loadContext, PBrowserOrId browser); async AppData(SerializedLoadContext loadContext, PBrowserOrId browser);
// methods corresponding to those of nsIWyciwygChannel // methods corresponding to those of nsIWyciwygChannel
async WriteToCacheEntry(nsString data); async WriteToCacheEntry(nsDependentSubstring data);
async CloseCacheEntry(nsresult reason); async CloseCacheEntry(nsresult reason);
async SetCharsetAndSource(int32_t source, nsCString charset); async SetCharsetAndSource(int32_t source, nsCString charset);
async SetSecurityInfo(nsCString securityInfo); async SetSecurityInfo(nsCString securityInfo);

16
netwerk/protocol/wyciwyg/WyciwygChannelChild.cpp
View file

@ -689,8 +689,22 @@ WyciwygChannelChild::WriteToCacheEntry(const nsAString & aData)
mSentAppData = true; mSentAppData = true;
} }
SendWriteToCacheEntry(PromiseFlatString(aData));
mState = WCC_ONWRITE; mState = WCC_ONWRITE;
// Give ourselves a megabyte of headroom for the message size. Convert bytes
// to wide chars.
static const size_t kMaxMessageSize = (IPC::Channel::kMaximumMessageSize - 1024) / 2;
size_t curIndex = 0;
size_t charsRemaining = aData.Length();
do {
size_t chunkSize = std::min(charsRemaining, kMaxMessageSize);
SendWriteToCacheEntry(Substring(aData, curIndex, chunkSize));
charsRemaining -= chunkSize;
curIndex += chunkSize;
} while (charsRemaining != 0);
return NS_OK; return NS_OK;
} }

2
netwerk/protocol/wyciwyg/WyciwygChannelParent.cpp
View file

@ -213,7 +213,7 @@ WyciwygChannelParent::RecvAsyncOpen(const URIParams& aOriginal,
} }
bool bool
WyciwygChannelParent::RecvWriteToCacheEntry(const nsString& data) WyciwygChannelParent::RecvWriteToCacheEntry(const nsDependentSubstring& data)
{ {
if (!mReceivedAppData) { if (!mReceivedAppData) {
printf_stderr("WyciwygChannelParent::RecvWriteToCacheEntry: FATAL ERROR: didn't receive app data\n"); printf_stderr("WyciwygChannelParent::RecvWriteToCacheEntry: FATAL ERROR: didn't receive app data\n");

2
netwerk/protocol/wyciwyg/WyciwygChannelParent.h
View file

@ -45,7 +45,7 @@ protected:
const uint32_t& loadFlags, const uint32_t& loadFlags,
const IPC::SerializedLoadContext& loadContext, const IPC::SerializedLoadContext& loadContext,
const PBrowserOrId &parent) override; const PBrowserOrId &parent) override;
virtual bool RecvWriteToCacheEntry(const nsString& data) override; virtual bool RecvWriteToCacheEntry(const nsDependentSubstring& data) override;
virtual bool RecvCloseCacheEntry(const nsresult& reason) override; virtual bool RecvCloseCacheEntry(const nsresult& reason) override;
virtual bool RecvSetCharsetAndSource(const int32_t& source, virtual bool RecvSetCharsetAndSource(const int32_t& source,
const nsCString& charset) override; const nsCString& charset) override;