stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8143879: jdk/internal/jimage/JImageReadTest.java crashes jvm in msvcr120.dll

Browse Source 
Correct iteration in ImageFileReader.remove and contains()

Reviewed-by: jlaskey
This commit is contained in:
Roger Riggs 2015-12-02 10:15:26 -05:00
parent bdca5d5f82
commit e863272e84
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
jdk/src/java.base/share/native/libjimage/imageFile.cpp
View File

@ -291,13 +291,10 @@ void ImageFileReaderTable::add(ImageFileReader* image) {
// Remove an image entry from the table.
void ImageFileReaderTable::remove(ImageFileReader* image) {
s4 last = _count - 1;
for (s4 i = 0; _count; i++) {
for (u4 i = 0; i < _count; i++) {
if (_table[i] == image) {
if (i != last) {
_table[i] = _table[last];
_count = last;
}
// Swap the last element into the found slot
_table[i] = _table[--_count];
break;
}
}
@ -310,7 +307,7 @@ void ImageFileReaderTable::remove(ImageFileReader* image) {
// Determine if image entry is in table.
bool ImageFileReaderTable::contains(ImageFileReader* image) {
for (s4 i = 0; _count; i++) {
for (u4 i = 0; i < _count; i++) {
if (_table[i] == image) {
return true;
}