8301760: Fix possible leak in SpNegoContext dispose

Yuri Nesterenko · Yuri Nesterenko · commit 713c020dc6d3 · 2023-02-16T06:38:22.000Z
Reviewed-by: phh
Backport-of: 3f3356bcbd2b2fbc545263dc70a48ee931a4e56b
diff --git a/jdk/src/share/classes/sun/security/jgss/spnego/SpNegoContext.java b/jdk/src/share/classes/sun/security/jgss/spnego/SpNegoContext.java
@@ -244,8 +244,11 @@ public final Provider getProvider() {
     }
 
     public final void dispose() throws GSSException {
-        mechContext = null;
         state = STATE_DELETED;
+        if (mechContext != null) {
+            mechContext.dispose();
+            mechContext = null;
+        }
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -244,8 +244,11 @@ public final Provider getProvider() {`
`244`	`244`	`}`
`245`	`245`
`246`	`246`	`public final void dispose() throws GSSException {`
`247`		`- mechContext = null;`
`248`	`247`	`state = STATE_DELETED;`
	`248`	`+ if (mechContext != null) {`
	`249`	`+ mechContext.dispose();`
	`250`	`+ mechContext = null;`
	`251`	`+ }`
`249`	`252`	`}`
`250`	`253`
`251`	`254`	`/**`