fix sigsev from freeing glfw standard cursors

moehreag · moehreag · commit 871ca4d90234 · 2025-09-19T14:10:36.000+02:00
diff --git a/1.20/src/main/java/io/github/axolotlclient/modules/hud/HudEditScreen.java b/1.20/src/main/java/io/github/axolotlclient/modules/hud/HudEditScreen.java
@@ -54,9 +54,9 @@ public class HudEditScreen extends Screen {
 	private static final BooleanOption snapping = new BooleanOption("snapping", true);
 	private static final OptionCategory hudEditScreenCategory = OptionCategory.create("hudEditScreen");
 	private static final int GRAB_TOLERANCE = 5;
-	private final long MOVE_CURSOR = GLFW.glfwCreateStandardCursor(GLFW.GLFW_RESIZE_ALL_CURSOR);
-	private final long DEFAULT_CURSOR = GLFW.glfwCreateStandardCursor(GLFW.GLFW_ARROW_CURSOR);
-	private final long NWSE_RESIZE_CURSOR = GLFW.glfwCreateStandardCursor(GLFW.GLFW_RESIZE_NWSE_CURSOR),
+	private static final long MOVE_CURSOR = GLFW.glfwCreateStandardCursor(GLFW.GLFW_RESIZE_ALL_CURSOR);
+	private static final long DEFAULT_CURSOR = GLFW.glfwCreateStandardCursor(GLFW.GLFW_ARROW_CURSOR);
+	private static final long NWSE_RESIZE_CURSOR = GLFW.glfwCreateStandardCursor(GLFW.GLFW_RESIZE_NWSE_CURSOR),
 		NESW_RESIZE_CURSOR = GLFW.glfwCreateStandardCursor(GLFW.GLFW_RESIZE_NESW_CURSOR);
 
 	public static boolean isSnappingEnabled() {
@@ -188,10 +188,6 @@ public void removed() {
 		setCursor(DEFAULT_CURSOR);
 		mode = ModificationMode.NONE;
 		super.removed();
-		GLFW.glfwDestroyCursor(MOVE_CURSOR);
-		GLFW.glfwDestroyCursor(DEFAULT_CURSOR);
-		GLFW.glfwDestroyCursor(NESW_RESIZE_CURSOR);
-		GLFW.glfwDestroyCursor(NWSE_RESIZE_CURSOR);
 	}
 
 	@Override
diff --git a/1.21.7/src/main/java/io/github/axolotlclient/modules/hud/HudEditScreen.java b/1.21.7/src/main/java/io/github/axolotlclient/modules/hud/HudEditScreen.java
@@ -54,9 +54,9 @@ public class HudEditScreen extends Screen {
 	private static final BooleanOption snapping = new BooleanOption("snapping", true);
 	private static final OptionCategory hudEditScreenCategory = OptionCategory.create("hudEditScreen");
 	private static final int GRAB_TOLERANCE = 5;
-	private final long MOVE_CURSOR = GLFW.glfwCreateStandardCursor(GLFW.GLFW_RESIZE_ALL_CURSOR);
-	private final long DEFAULT_CURSOR = GLFW.glfwCreateStandardCursor(GLFW.GLFW_ARROW_CURSOR);
-	private final long NWSE_RESIZE_CURSOR = GLFW.glfwCreateStandardCursor(GLFW.GLFW_RESIZE_NWSE_CURSOR),
+	private static final long MOVE_CURSOR = GLFW.glfwCreateStandardCursor(GLFW.GLFW_RESIZE_ALL_CURSOR);
+	private static final long DEFAULT_CURSOR = GLFW.glfwCreateStandardCursor(GLFW.GLFW_ARROW_CURSOR);
+	private static final long NWSE_RESIZE_CURSOR = GLFW.glfwCreateStandardCursor(GLFW.GLFW_RESIZE_NWSE_CURSOR),
 		NESW_RESIZE_CURSOR = GLFW.glfwCreateStandardCursor(GLFW.GLFW_RESIZE_NESW_CURSOR);
 
 	public static boolean isSnappingEnabled() {
@@ -157,10 +157,6 @@ public void removed() {
 		setCursor(DEFAULT_CURSOR);
 		mode = ModificationMode.NONE;
 		super.removed();
-		GLFW.glfwDestroyCursor(MOVE_CURSOR);
-		GLFW.glfwDestroyCursor(DEFAULT_CURSOR);
-		GLFW.glfwDestroyCursor(NESW_RESIZE_CURSOR);
-		GLFW.glfwDestroyCursor(NWSE_RESIZE_CURSOR);
 	}
 
 	@Override
diff --git a/1.21/src/main/java/io/github/axolotlclient/modules/hud/HudEditScreen.java b/1.21/src/main/java/io/github/axolotlclient/modules/hud/HudEditScreen.java
@@ -54,9 +54,9 @@ public class HudEditScreen extends Screen {
 	private static final BooleanOption snapping = new BooleanOption("snapping", true);
 	private static final OptionCategory hudEditScreenCategory = OptionCategory.create("hudEditScreen");
 	private static final int GRAB_TOLERANCE = 5;
-	private final long MOVE_CURSOR = GLFW.glfwCreateStandardCursor(GLFW.GLFW_RESIZE_ALL_CURSOR);
-	private final long DEFAULT_CURSOR = GLFW.glfwCreateStandardCursor(GLFW.GLFW_ARROW_CURSOR);
-	private final long NWSE_RESIZE_CURSOR = GLFW.glfwCreateStandardCursor(GLFW.GLFW_RESIZE_NWSE_CURSOR),
+	private static final long MOVE_CURSOR = GLFW.glfwCreateStandardCursor(GLFW.GLFW_RESIZE_ALL_CURSOR);
+	private static final long DEFAULT_CURSOR = GLFW.glfwCreateStandardCursor(GLFW.GLFW_ARROW_CURSOR);
+	private static final long NWSE_RESIZE_CURSOR = GLFW.glfwCreateStandardCursor(GLFW.GLFW_RESIZE_NWSE_CURSOR),
 		NESW_RESIZE_CURSOR = GLFW.glfwCreateStandardCursor(GLFW.GLFW_RESIZE_NESW_CURSOR);
 
 	public static boolean isSnappingEnabled() {
@@ -157,10 +157,6 @@ public void removed() {
 		setCursor(DEFAULT_CURSOR);
 		mode = ModificationMode.NONE;
 		super.removed();
-		GLFW.glfwDestroyCursor(MOVE_CURSOR);
-		GLFW.glfwDestroyCursor(DEFAULT_CURSOR);
-		GLFW.glfwDestroyCursor(NESW_RESIZE_CURSOR);
-		GLFW.glfwDestroyCursor(NWSE_RESIZE_CURSOR);
 	}
 
 	@Override
diff --git a/1.8.9/src/main/java/io/github/axolotlclient/modules/hud/HudEditScreen.java b/1.8.9/src/main/java/io/github/axolotlclient/modules/hud/HudEditScreen.java
@@ -286,7 +286,7 @@ public void removed() {
 		super.removed();
 		setCursor(DEFAULT_CURSOR);
 		mode = ModificationMode.NONE;
-		WindowAccess.getInstance().destroyCursors(DEFAULT_CURSOR, NWSE_RESIZE_CURSOR, NESW_RESIZE_CURSOR, MOVE_CURSOR);
+		WindowAccess.getInstance().destroyStandardCursor(DEFAULT_CURSOR, NWSE_RESIZE_CURSOR, NESW_RESIZE_CURSOR, MOVE_CURSOR);
 	}
 
 	@Override
diff --git a/1.8.9/src/main/java/io/github/axolotlclient/util/WindowAccess.java b/1.8.9/src/main/java/io/github/axolotlclient/util/WindowAccess.java
@@ -53,7 +53,7 @@ public enum Cursor {
 
 	public abstract void setCursor(long cursor);
 
-	public abstract void destroyCursors(long... cursors);
+	public abstract void destroyStandardCursor(long... cursors);
 
 	public abstract boolean rawMouseMotionAvailable();
 
@@ -105,7 +105,7 @@ public void setCursor(long cursor) {
 		}
 
 		@Override
-		public void destroyCursors(long... cursors) {
+		public void destroyStandardCursor(long... cursors) {
 
 		}
 
@@ -138,7 +138,7 @@ public void setCursor(long cursor) {
 		}
 
 		@Override
-		public void destroyCursors(long... cursors) {
+		public void destroyStandardCursor(long... cursors) {
 			for (long c : cursors) {
 				SDLMouse.SDL_DestroyCursor(c);
 			}
@@ -173,10 +173,8 @@ public void setCursor(long cursor) {
 		}
 
 		@Override
-		public void destroyCursors(long... cursors) {
-			for (long c : cursors) {
-				GLFW.glfwDestroyCursor(c);
-			}
+		public void destroyStandardCursor(long... cursors) {
+			// we do not need to destroy glfw standard cursors ourselves
 		}
 
 		@Override

Original file line number	Diff line number	Diff line change
`@@ -286,7 +286,7 @@ public void removed() {`
`286`	`286`	`super.removed();`
`287`	`287`	`setCursor(DEFAULT_CURSOR);`
`288`	`288`	`mode = ModificationMode.NONE;`
`289`		`- WindowAccess.getInstance().destroyCursors(DEFAULT_CURSOR, NWSE_RESIZE_CURSOR, NESW_RESIZE_CURSOR, MOVE_CURSOR);`
	`289`	`+ WindowAccess.getInstance().destroyStandardCursor(DEFAULT_CURSOR, NWSE_RESIZE_CURSOR, NESW_RESIZE_CURSOR, MOVE_CURSOR);`
`290`	`290`	`}`
`291`	`291`
`292`	`292`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public enum Cursor {`
`53`	`53`
`54`	`54`	`public abstract void setCursor(long cursor);`
`55`	`55`
`56`		`- public abstract void destroyCursors(long... cursors);`
	`56`	`+ public abstract void destroyStandardCursor(long... cursors);`
`57`	`57`
`58`	`58`	`public abstract boolean rawMouseMotionAvailable();`
`59`	`59`
`@@ -105,7 +105,7 @@ public void setCursor(long cursor) {`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`@Override`
`108`		`- public void destroyCursors(long... cursors) {`
	`108`	`+ public void destroyStandardCursor(long... cursors) {`
`109`	`109`
`110`	`110`	`}`
`111`	`111`
`@@ -138,7 +138,7 @@ public void setCursor(long cursor) {`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`@Override`
`141`		`- public void destroyCursors(long... cursors) {`
	`141`	`+ public void destroyStandardCursor(long... cursors) {`
`142`	`142`	`for (long c : cursors) {`
`143`	`143`	`SDLMouse.SDL_DestroyCursor(c);`
`144`	`144`	`}`
`@@ -173,10 +173,8 @@ public void setCursor(long cursor) {`
`173`	`173`	`}`
`174`	`174`
`175`	`175`	`@Override`
`176`		`- public void destroyCursors(long... cursors) {`
`177`		`- for (long c : cursors) {`
`178`		`- GLFW.glfwDestroyCursor(c);`
`179`		`- }`
	`176`	`+ public void destroyStandardCursor(long... cursors) {`
	`177`	`+ // we do not need to destroy glfw standard cursors ourselves`
`180`	`178`	`}`
`181`	`179`
`182`	`180`	`@Override`