8292214: Memory leak in getAllConfigs of awt_GraphicsEnv.c:386

GoeLin · GoeLin · commit fceca5a9e3cb · 2025-09-15T12:28:27.000Z
Backport-of: 1166a8abd2e5fba16b5cd29431de2628a52a8e08
diff --git a/src/java.desktop/unix/native/libawt_xawt/awt/awt_GraphicsEnv.c b/src/java.desktop/unix/native/libawt_xawt/awt/awt_GraphicsEnv.c
@@ -386,7 +386,7 @@ getAllConfigs (JNIEnv *env, int screen, AwtScreenDataPtr screenDataPtr) {
          */
         screenDataPtr->defaultConfig = makeDefaultConfig(env, screen);
         if (screenDataPtr->defaultConfig == NULL) {
-            return;
+            goto cleanup;
         }
     }
 
@@ -575,6 +575,9 @@ getAllConfigs (JNIEnv *env, int screen, AwtScreenDataPtr screenDataPtr) {
 
 cleanup:
     if (success != JNI_TRUE) {
+        for (i = 0; i < nConfig; i++) {
+            free(graphicsConfigs[i]);
+        }
         free(graphicsConfigs);
     }
     if (n8p != 0)

Original file line number	Diff line number	Diff line change
`@@ -386,7 +386,7 @@ getAllConfigs (JNIEnv *env, int screen, AwtScreenDataPtr screenDataPtr) {`
`386`	`386`	`*/`
`387`	`387`	`screenDataPtr->defaultConfig = makeDefaultConfig(env, screen);`
`388`	`388`	`if (screenDataPtr->defaultConfig == NULL) {`
`389`		`- return;`
	`389`	`+ goto cleanup;`
`390`	`390`	`}`
`391`	`391`	`}`
`392`	`392`
`@@ -575,6 +575,9 @@ getAllConfigs (JNIEnv *env, int screen, AwtScreenDataPtr screenDataPtr) {`
`575`	`575`
`576`	`576`	`cleanup:`
`577`	`577`	`if (success != JNI_TRUE) {`
	`578`	`+ for (i = 0; i < nConfig; i++) {`
	`579`	`+ free(graphicsConfigs[i]);`
	`580`	`+ }`
`578`	`581`	`free(graphicsConfigs);`
`579`	`582`	`}`
`580`	`583`	`if (n8p != 0)`