diff options
author | Anton Lapounov <anton.lapounov@microsoft.com> | 2020-02-13 14:27:12 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-13 14:27:12 -0800 |
commit | 75d2c46571a5e05494d29468f4a37198abc06ace (patch) | |
tree | 0c1e09a15f564aca9687f96ad493bda2f1771a3a /src | |
parent | 04d3f0da1b610418eaccd26c8ef1f7393c72c053 (diff) | |
download | coreclr-75d2c46571a5e05494d29468f4a37198abc06ace.tar.gz coreclr-75d2c46571a5e05494d29468f4a37198abc06ace.tar.bz2 coreclr-75d2c46571a5e05494d29468f4a37198abc06ace.zip |
Fix GC heap corruption on ARM. (#27985)
Port of dotnet/runtime#1389.
Diffstat (limited to 'src')
-rw-r--r-- | src/gc/gc.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gc/gc.cpp b/src/gc/gc.cpp index ec2b855ff6..35c0a0e5cc 100644 --- a/src/gc/gc.cpp +++ b/src/gc/gc.cpp @@ -14980,7 +14980,7 @@ allocate_in_free: #else // FEATURE_STRUCTALIGN if (!((old_loc == 0) || same_large_alignment_p (old_loc, result+pad))) { - pad += switch_alignment_size (is_plug_padded (old_loc)); + pad += switch_alignment_size (pad != 0); set_node_realigned (old_loc); dprintf (3, ("Allocation realignment old_loc: %Ix, new_loc:%Ix", (size_t)old_loc, (size_t)(result+pad))); |