mirrors/JetBrainsRuntime
1
0
Fork 0
mirror of https://github.com/JetBrains/JetBrainsRuntime.git synced 2025-12-06 09:29:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

JBR-4774 macOS: SIGILL at [libsystem_kernel] __kill in NPE / VolatileSurfaceManager.displayChanged / __displaycb_handle_block_invoke

Browse Source 
Guarded against multiple displayChanged() notifications

(cherry picked from commit 165c9aa3aa)
This commit is contained in:
Alexey Ushakov
2022-08-30 20:44:28 +02:00
committed by jbrbot
parent 134b8db348
commit 10f2221851
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/java.desktop/share/classes/sun/awt/image/VolatileSurfaceManager.java
View File

@@ -68,14 +68,14 @@ public abstract class VolatileSurfaceManager
/**
* The accelerated SurfaceData object.
*/
protected SurfaceData sdAccel;
protected volatile SurfaceData sdAccel;
/**
* The software-based SurfaceData object. Only create when first asked
* to (otherwise it is a waste of memory as it will only be used in
* situations of surface loss).
*/
protected SurfaceData sdBackup;
protected volatile SurfaceData sdBackup;
/**
* The current SurfaceData object.
@@ -347,7 +347,8 @@ public abstract class VolatileSurfaceManager
public void displayChanged() {
lostSurface = true;
boolean needBackup = false;
if (sdAccel != null) {
SurfaceData oldData = sdAccel;
if (oldData != null) {
// First, nullify the software surface. This guards against
// using a SurfaceData that was created in a different
// display mode.
@@ -357,11 +358,8 @@ public abstract class VolatileSurfaceManager
}
// Now, invalidate the old hardware-based SurfaceData
// Note that getBackupSurface may set sdAccel to null so we have to invalidate it before
SurfaceData oldData = sdAccel;
sdAccel = null;
if (oldData != null) {
oldData.invalidate();
}
oldData.invalidate();
}
// Update graphicsConfig for the vImg in case it changed due to
// this display change event