Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-13 18:27:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1325834: Add crash reporter annotations to report COM marshaling failure codes; r=jimm

Browse Source 
MozReview-Commit-ID: FcEBoU0DzzR

--HG--
extra : rebase_source : a6cb3f2735ff0470bcff96b3832bad794701783f
This commit is contained in:
Aaron Klotz 2017-02-27 11:55:42 -07:00
parent 833aa2af27
commit 10b6488d0c
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ipc/mscom/ProxyStream.cpp
View File

@ -4,11 +4,11 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "mozilla/Move.h"
#include "mozilla/mscom/EnsureMTA.h"
#include "mozilla/mscom/ProxyStream.h"
#include "mozilla/mscom/Utils.h"
#include "mozilla/Move.h"
#include "nsExceptionHandler.h"
#include <windows.h>
#include <objbase.h>
@ -44,6 +44,8 @@ ProxyStream::ProxyStream(const BYTE* aInitBuf, const int aInitBufSize)
return;
}
HRESULT unmarshalResult = S_OK;
// We need to convert to an interface here otherwise we mess up const
// correctness with IPDL. We'll request an IUnknown and then QI the
// actual interface later.
@ -53,10 +55,10 @@ ProxyStream::ProxyStream(const BYTE* aInitBuf, const int aInitBufSize)
IUnknown* rawUnmarshaledProxy = nullptr;
// OK to forget mStream when calling into this function because the stream
// gets released even if the unmarshaling part fails.
DebugOnly<HRESULT> hr =
unmarshalResult =
::CoGetInterfaceAndReleaseStream(mStream.forget().take(), IID_IUnknown,
(void**)&rawUnmarshaledProxy);
MOZ_ASSERT(SUCCEEDED(hr));
MOZ_ASSERT(SUCCEEDED(unmarshalResult));
mUnmarshaledProxy.reset(rawUnmarshaledProxy);
};
@ -68,6 +70,12 @@ ProxyStream::ProxyStream(const BYTE* aInitBuf, const int aInitBufSize)
// When marshaling in child processes, we want to force the MTA.
EnsureMTA mta(marshalFn);
}
if (FAILED(unmarshalResult)) {
nsPrintfCString hrAsStr("0x%08X", unmarshalResult);
CrashReporter::AnnotateCrashReport(
NS_LITERAL_CSTRING("CoGetInterfaceAndReleaseStreamFailure"), hrAsStr);
}
}
already_AddRefed<IStream>
@ -156,6 +164,8 @@ ProxyStream::ProxyStream(REFIID aIID, IUnknown* aObject)
RefPtr<IStream> stream;
HGLOBAL hglobal = NULL;
HRESULT marshalResult = S_OK;
auto marshalFn = [&]() -> void
{
HRESULT hr = ::CreateStreamOnHGlobal(nullptr, TRUE, getter_AddRefs(stream));
@ -166,6 +176,7 @@ ProxyStream::ProxyStream(REFIID aIID, IUnknown* aObject)
hr = ::CoMarshalInterface(stream, aIID, aObject, MSHCTX_LOCAL, nullptr,
MSHLFLAGS_NORMAL);
if (FAILED(hr)) {
marshalResult = hr;
return;
}
@ -182,6 +193,12 @@ ProxyStream::ProxyStream(REFIID aIID, IUnknown* aObject)
EnsureMTA mta(marshalFn);
}
if (FAILED(marshalResult)) {
nsPrintfCString hrAsStr("0x%08X", marshalResult);
CrashReporter::AnnotateCrashReport(
NS_LITERAL_CSTRING("CoMarshalInterfaceFailure"), hrAsStr);
}
mStream = mozilla::Move(stream);
if (hglobal) {
mGlobalLockedBuf = reinterpret_cast<BYTE*>(::GlobalLock(hglobal));