Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Revert "Fix handling of incorrect assemblies on Unix (#16747)" #16790

Merged
merged 1 commit into from
Mar 7, 2018
Merged

Revert "Fix handling of incorrect assemblies on Unix (#16747)" #16790

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/debug/daccess/nidump.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -720,7 +720,7 @@ NativeImageDumper::DumpNativeImage()

for (COUNT_T i = 0; i < m_decoder.GetNumberOfSections(); i++)
{
PTR_IMAGE_SECTION_HEADER section = m_decoder.FindFirstSection() + i;
PTR_IMAGE_SECTION_HEADER section = dptr_add(m_decoder.FindFirstSection(), i);
m_display->Section(reinterpret_cast<char *>(section->Name),
section->VirtualAddress,
section->SizeOfRawData);
Expand Down
2 changes: 1 addition & 1 deletion src/inc/pedecoder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ class PEDecoder
UINT32 GetWin32VersionValue() const;
COUNT_T GetNumberOfRvaAndSizes() const;
COUNT_T GetNumberOfSections() const;
PTR_IMAGE_SECTION_HEADER FindFirstSection() const;
IMAGE_SECTION_HEADER *FindFirstSection() const;
IMAGE_SECTION_HEADER *FindSection(LPCSTR sectionName) const;

DWORD GetImageIdentity() const;
Expand Down
2 changes: 1 addition & 1 deletion src/inc/pedecoder.inl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1178,7 +1178,7 @@ inline DWORD PEDecoder::GetImageIdentity() const
}


inline PTR_IMAGE_SECTION_HEADER PEDecoder::FindFirstSection() const
inline IMAGE_SECTION_HEADER *PEDecoder::FindFirstSection() const
{
CONTRACT(IMAGE_SECTION_HEADER *)
{
Expand Down
3 changes: 1 addition & 2 deletions src/utilcode/pedecoder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,6 @@ BOOL PEDecoder::HasWriteableSections() const
CONTRACT_CHECK
{
INSTANCE_CHECK;
PRECONDITION(CheckNTHeaders());
PRECONDITION(CheckFormat());
NOTHROW;
GC_NOTRIGGER;
Expand All @@ -454,7 +453,7 @@ BOOL PEDecoder::HasWriteableSections() const
}
CONTRACT_CHECK_END;

PTR_IMAGE_SECTION_HEADER pSection = FindFirstSection();
PTR_IMAGE_SECTION_HEADER pSection = FindFirstSection(FindNTHeaders());
_ASSERTE(pSection != NULL);

PTR_IMAGE_SECTION_HEADER pSectionEnd = pSection + VAL16(FindNTHeaders()->FileHeader.NumberOfSections);
Expand Down
7 changes: 3 additions & 4 deletions src/vm/peimage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1029,9 +1029,7 @@ PTR_PEImageLayout PEImage::CreateLayoutFlat(BOOL bPermitWriteableSections)

PTR_PEImageLayout pFlatLayout = PEImageLayout::LoadFlat(GetFileHandle(),this);

if (!bPermitWriteableSections
&& pFlatLayout->CheckNTHeaders()
&& pFlatLayout->HasWriteableSections())
if (!bPermitWriteableSections && pFlatLayout->HasWriteableSections())
{
pFlatLayout->Release();

Expand Down Expand Up @@ -1116,7 +1114,8 @@ void PEImage::Load()

#ifdef PLATFORM_UNIX
if (m_pLayouts[IMAGE_FLAT] != NULL
&& m_pLayouts[IMAGE_FLAT]->CheckILOnlyFormat()
&& m_pLayouts[IMAGE_FLAT]->CheckFormat()
&& m_pLayouts[IMAGE_FLAT]->IsILOnly()
&& !m_pLayouts[IMAGE_FLAT]->HasWriteableSections())
{
// IL-only images with writeable sections are mapped in general way,
Expand Down
37 changes: 0 additions & 37 deletions tests/src/Loader/regressions/GitHub_15544/main.cs
View file
Open in desktop

This file was deleted.

31 changes: 0 additions & 31 deletions tests/src/Loader/regressions/GitHub_15544/main.csproj
View file
Open in desktop

This file was deleted.