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

8274651: Possible race in FontDesignMetrics.KeyReference.dispose

Browse Source 
Reviewed-by: prr, serb
This commit is contained in:
Andrey Turbanov 2021-10-05 00:53:17 +00:00 committed by Sergey Bylokhov
parent 2e542e33b8
commit e43f540cde
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/java.desktop/share/classes/sun/font/FontDesignMetrics.java
View File

@ -188,16 +188,10 @@ public final class FontDesignMetrics extends FontMetrics {
/* It is possible that since this reference object has been /* It is possible that since this reference object has been
* enqueued, that a new metrics has been put into the table * enqueued, that a new metrics has been put into the table
* for the same key value. So we'll test to see if the table maps * for the same key value. So we'll test to see if the table maps
* to THIS reference. If its a new one, we'll leave it alone. * to THIS reference. If it's a new one, we'll leave it alone.
* It is possible that a new entry comes in after our test, but
* it is unlikely and if this were a problem we would need to
* synchronize all 'put' and 'remove' accesses to the cache which
* I would prefer not to do.
*/ */
public void dispose() { public void dispose() {
if (metricsCache.get(key) == this) { metricsCache.remove(key, this);
metricsCache.remove(key);
}
} }
} }
@ -595,7 +589,7 @@ public final class FontDesignMetrics extends FontMetrics {
// if the calculations in any other methods change this needs // if the calculations in any other methods change this needs
// to be changed too. // to be changed too.
// the 0.95 value used here and in the other methods allows some // the 0.95 value used here and in the other methods allows some
// tiny fraction of leeway before rouding up. A higher value (0.99) // tiny fraction of leeway before rounding up. A higher value (0.99)
// caused some excessive rounding up. // caused some excessive rounding up.
return return
(int)(roundingUpValue + descent + leading) - (int)(roundingUpValue + descent + leading) -