8255694: memory leak in JDWP debug agent after calling JVMTI GetAllThreads

plummercj · plummercj · commit a250716ad299 · 2020-11-02T20:13:32.000Z
Reviewed-by: amenkov, sspitsyn
diff --git a/src/jdk.jdwp.agent/share/native/libjdwp/threadControl.c b/src/jdk.jdwp.agent/share/native/libjdwp/threadControl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -836,6 +836,7 @@ threadControl_onHook(void)
                  */
                 node->isStarted = JNI_TRUE;
             }
+            jvmtiDeallocate(threads);
         }
 
     } END_WITH_LOCAL_REFS(env)
@@ -1549,7 +1550,8 @@ threadControl_suspendAll(void)
             suspendAllCount++;
         }
 
-    err: ;
+    err:
+        jvmtiDeallocate(threads);
 
     } END_WITH_LOCAL_REFS(env)
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 1998, 2007, Oracle and/or its affiliates. All rights reserved.`
	`2`	`+ * Copyright (c) 1998, 2020, Oracle and/or its affiliates. All rights reserved.`
`3`	`3`	`* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.`
`4`	`4`	`*`
`5`	`5`	`* This code is free software; you can redistribute it and/or modify it`
`@@ -836,6 +836,7 @@ threadControl_onHook(void)`
`836`	`836`	`*/`
`837`	`837`	`node->isStarted = JNI_TRUE;`
`838`	`838`	`}`
	`839`	`+ jvmtiDeallocate(threads);`
`839`	`840`	`}`
`840`	`841`
`841`	`842`	`} END_WITH_LOCAL_REFS(env)`
`@@ -1549,7 +1550,8 @@ threadControl_suspendAll(void)`
`1549`	`1550`	`suspendAllCount++;`
`1550`	`1551`	`}`
`1551`	`1552`
`1552`		`- err: ;`
	`1553`	`+ err:`
	`1554`	`+ jvmtiDeallocate(threads);`
`1553`	`1555`
`1554`	`1556`	`} END_WITH_LOCAL_REFS(env)`
`1555`	`1557`