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

Alisen Chung · Alexander Zvegintsev · commit 1166a8abd2e5 · 2022-10-04T15:22:18.000Z
Reviewed-by: azvegint, dnguyen
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
@@ -383,7 +383,7 @@ getAllConfigs (JNIEnv *env, int screen, AwtScreenDataPtr screenDataPtr) {
          */
         screenDataPtr->defaultConfig = makeDefaultConfig(env, screen);
         if (screenDataPtr->defaultConfig == NULL) {
-            return;
+            goto cleanup;
         }
     }
 
@@ -572,6 +572,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
`@@ -383,7 +383,7 @@ getAllConfigs (JNIEnv *env, int screen, AwtScreenDataPtr screenDataPtr) {`
`383`	`383`	`*/`
`384`	`384`	`screenDataPtr->defaultConfig = makeDefaultConfig(env, screen);`
`385`	`385`	`if (screenDataPtr->defaultConfig == NULL) {`
`386`		`- return;`
	`386`	`+ goto cleanup;`
`387`	`387`	`}`
`388`	`388`	`}`
`389`	`389`
`@@ -572,6 +572,9 @@ getAllConfigs (JNIEnv *env, int screen, AwtScreenDataPtr screenDataPtr) {`
`572`	`572`
`573`	`573`	`cleanup:`
`574`	`574`	`if (success != JNI_TRUE) {`
	`575`	`+ for (i = 0; i < nConfig; i++) {`
	`576`	`+ free(graphicsConfigs[i]);`
	`577`	`+ }`
`575`	`578`	`free(graphicsConfigs);`
`576`	`579`	`}`
`577`	`580`	`if (n8p != 0)`