Skip to content
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

Jump to bottom

Error out when struct size is bigger than int.MaxValue #104393

Merged
merged 20 commits into from
Aug 21, 2024
Merged

Error out when struct size is bigger than int.MaxValue #104393

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
f7f124b
Error out when field size is too big
fanyang-mono Jul 3, 2024
8f7388e
Error out during type loading and add a test
fanyang-mono Jul 8, 2024
528b737
Move test to a different file
fanyang-mono Jul 9, 2024
6c91570
Make things loadable in the managed type system
MichalStrehovsky Jul 11, 2024
d3f062a
Error out when size overflow the value that int could hold
fanyang-mono Jul 15, 2024
c843b90
Update the threshold to FIELD_OFFSET_LAST_REAL_OFFSET
fanyang-mono Jul 16, 2024
0ca301c
Change the threashold to int.MaxValue
fanyang-mono Jul 30, 2024
afd5c8f
Fix mono struct size overflow issue
fanyang-mono Aug 1, 2024
b091a2a
Add signed/unsigned type conversion
fanyang-mono Aug 1, 2024
4a57e6c
Use gint64 instead of long, due to windows
fanyang-mono Aug 2, 2024
186acf8
Update src/mono/mono/metadata/class-init.c
fanyang-mono Aug 2, 2024
33145a2
Fix test
fanyang-mono Aug 5, 2024
6e0c43b
Add CoreCLR test for Explicit struct
fanyang-mono Aug 6, 2024
b557816
Address review feedback
fanyang-mono Aug 6, 2024
339bc63
Fixes Explicit struct size for Mono
fanyang-mono Aug 6, 2024
a0adb6d
Disable explicit struct tests on 32bit platforms, due to out of memor…
fanyang-mono Aug 7, 2024
39cc6f1
Disable CoreCLR test for NativeAOT and crossgen
fanyang-mono Aug 9, 2024
08daa62
Fix test
fanyang-mono Aug 10, 2024
d7160c7
Merge remote-tracking branch 'origin/main' into fix_overflow
fanyang-mono Aug 15, 2024
5fad351
Add RequiresProcessIsolation for CoreCLR test
fanyang-mono Aug 15, 2024
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
3 changes: 3 additions & 0 deletions src/coreclr/vm/classlayoutinfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,9 @@ namespace
LayoutRawFieldInfo* pfwalk = *pSortWalk;
RawFieldPlacementInfo* placementInfo = &pfwalk->m_placement;

if (placementInfo->m_size > FIELD_OFFSET_LAST_REAL_OFFSET)
fanyang-mono marked this conversation as resolved.
Show resolved Hide resolved
COMPlusThrow(kTypeLoadException, W("TypeLoad_FieldSizeTooBig"));

BYTE alignmentRequirement = (BYTE)placementInfo->m_alignment;

alignmentRequirement = min(alignmentRequirement, packingSize);
Expand Down
3 changes: 3 additions & 0 deletions src/libraries/System.Private.CoreLib/src/Resources/Strings.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3653,6 +3653,9 @@
<data name="TypeLoad_ResolveTypeFromAssembly" xml:space="preserve">
<value>Could not resolve type '{0}' in assembly '{1}'.</value>
</data>
<data name="TypeLoad_FieldSizeTooBig" xml:space="preserve">
fanyang-mono marked this conversation as resolved.
Show resolved Hide resolved
<value>Type load failed, because the size of a field is too big.</value>
</data>
<data name="UnauthorizedAccess_IODenied_NoPathName" xml:space="preserve">
<value>Access to the path is denied.</value>
</data>
Expand Down
Loading