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

Bug 1514592: Don't call RpcExceptionCode if we don't HAVE_SEH_EXCEPTIONS. r=aklotz

Browse Source
This commit is contained in:
David Major 2019-01-07 17:58:45 -05:00
parent a0455cf9bc
commit 3ccc14bcb1
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ipc/mscom/StructStream.h
View File

@ -52,10 +52,12 @@ class MOZ_NON_TEMPORARY_CLASS StructToStream {
} }
MOZ_SEH_TRY { aEncodeFnPtr(mHandle, &aSrcStruct); } MOZ_SEH_TRY { aEncodeFnPtr(mHandle, &aSrcStruct); }
#ifdef HAVE_SEH_EXCEPTIONS
MOZ_SEH_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { MOZ_SEH_EXCEPT(EXCEPTION_EXECUTE_HANDLER) {
mStatus = ::RpcExceptionCode(); mStatus = ::RpcExceptionCode();
return; return;
} }
#endif
if (!mBuffer || !mEncodedLen) { if (!mBuffer || !mEncodedLen) {
mStatus = RPC_X_NO_MEMORY; mStatus = RPC_X_NO_MEMORY;
@ -210,10 +212,12 @@ class MOZ_NON_TEMPORARY_CLASS StructFromStream {
ZeroMemory(aDestStruct, sizeof(StructT)); ZeroMemory(aDestStruct, sizeof(StructT));
MOZ_SEH_TRY { aDecodeFnPtr(mHandle, aDestStruct); } MOZ_SEH_TRY { aDecodeFnPtr(mHandle, aDestStruct); }
#ifdef HAVE_SEH_EXCEPTIONS
MOZ_SEH_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { MOZ_SEH_EXCEPT(EXCEPTION_EXECUTE_HANDLER) {
mStatus = ::RpcExceptionCode(); mStatus = ::RpcExceptionCode();
return false; return false;
} }
#endif
return true; return true;
} }