infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-07-18 23:19:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

6943926: G1: Integer overflow during heap region verification

Browse Source 
The expression that calculates the live bytes for a heap region can overflow for a suitably large humongous region/object. Cache the object size in a suitably sized local variable so that the expression is converted to a wider type.

Reviewed-by: tonyp, jmasa, iveresov, apetrusenko
This commit is contained in:
John Cuthbertson 2010-04-15 15:52:55 -07:00
parent 9b4fc8fc23
commit 6110c052aa
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
View File

@ -2194,8 +2194,10 @@ public:
assert(o != NULL, "Huh?");
if (!_g1h->is_obj_dead_cond(o, _use_prev_marking)) {
o->oop_iterate(&isLive);
if (!_hr->obj_allocated_since_prev_marking(o))
_live_bytes += (o->size() * HeapWordSize);
if (!_hr->obj_allocated_since_prev_marking(o)) {
size_t obj_size = o->size(); // Make sure we don't overflow
_live_bytes += (obj_size * HeapWordSize);
}
}
}
size_t live_bytes() { return _live_bytes; }