Skip to content

Commit b0235cd

Browse files
authored
Fix ObjectsEqual (#2439)
1 parent c658cf1 commit b0235cd

File tree

1 file changed

+13
-1
lines changed

1 file changed

+13
-1
lines changed

src/CLR/Core/CLR_RT_HeapBlock.cpp

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1362,12 +1362,24 @@ bool CLR_RT_HeapBlock::ObjectsEqual(
13621362
// boxed primitive or enum type
13631363
obj = &rightObj[1];
13641364
}
1365+
else
1366+
{
1367+
// boxed value type
1368+
obj = rightObj;
1369+
}
13651370

13661371
return ObjectsEqual(*leftObj, *obj, false);
13671372
}
13681373
else
13691374
{
1370-
return ObjectsEqual(*leftObj, *rightObj, false);
1375+
if (rightObj == NULL)
1376+
{
1377+
return false;
1378+
}
1379+
else
1380+
{
1381+
return ObjectsEqual(*leftObj, *rightObj, false);
1382+
}
13711383
}
13721384
}
13731385
else

0 commit comments

Comments
 (0)