Skip to content

Allow execution of R2R code in singlefile app on windows. #40104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jkotas merged 7 commits into from
Aug 6, 2020
Merged

Allow execution of R2R code in singlefile app on windows. #40104

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
474fc32
Keep executable PE sections executable in LayoutILOnly.
VSadov Jul 30, 2020
af3da0d
Install unwind handlers if present
VSadov Jul 31, 2020
643a1b4
do not do RtlAddFunctionTable on x86
VSadov Jul 31, 2020
5f72a52
Check for Cor header before checking for R2R header.
VSadov Aug 2, 2020
f1eb7ff
Delete function table in image dtor
VSadov Aug 2, 2020
6821c32
Avoid PAGE_EXECUTE_READWRITE, we should not need writeable for R2R
VSadov Aug 4, 2020
d411d53
Do relocations in ConvertedImageLayout only if the file is in a bundl…
VSadov Aug 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Install unwind handlers if present
  • Loading branch information
@VSadov
VSadov committed Aug 3, 2020
commit af3da0d012c7b398e7a4e243daf2a5394a4caa55
13 changes: 13 additions & 0 deletions src/coreclr/src/vm/peimagelayout.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,6 +445,19 @@ ConvertedImageLayout::ConvertedImageLayout(PEImageLayout* source)
ThrowHR(COR_E_BADIMAGEFORMAT);

ApplyBaseRelocations();

// Check if there is a static function table.
COUNT_T cbSize = 0;
PT_RUNTIME_FUNCTION pExceptionDir = (PT_RUNTIME_FUNCTION)GetDirectoryEntryData(IMAGE_DIRECTORY_ENTRY_EXCEPTION, &cbSize);
DWORD tableSize = cbSize / sizeof(T_RUNTIME_FUNCTION);

if (pExceptionDir != NULL)
{
if (!RtlAddFunctionTable(pExceptionDir, tableSize, (DWORD64)this->GetBase()))
ThrowLastError();

//TODO: WIP remember tbl to undo the above when releasing img
}
}
#endif
}
Expand Down