From ae1eb286c6a2e76c3b38d68641208d4c01d4eef8 Mon Sep 17 00:00:00 2001
From: Thomas Stuefe <stuefe@openjdk.org>
Date: Thu, 3 Dec 2020 07:50:19 +0000
Subject: [PATCH] 8257604: JNI_ArgumentPusherVaArg leaks valist

Reviewed-by: dcubed, coleenp
---
 src/hotspot/share/prims/jni.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/hotspot/share/prims/jni.cpp b/src/hotspot/share/prims/jni.cpp
index c400456f2ef..bdf03279580 100644
--- a/src/hotspot/share/prims/jni.cpp
+++ b/src/hotspot/share/prims/jni.cpp
@@ -870,7 +870,6 @@ class JNI_ArgumentPusher : public SignatureIterator {
 
 
 class JNI_ArgumentPusherVaArg : public JNI_ArgumentPusher {
- protected:
   va_list _ap;
 
   void set_ap(va_list rap) {
@@ -906,6 +905,10 @@ class JNI_ArgumentPusherVaArg : public JNI_ArgumentPusher {
     set_ap(rap);
   }
 
+  ~JNI_ArgumentPusherVaArg() {
+    va_end(_ap);
+  }
+
   virtual void push_arguments_on(JavaCallArguments* arguments) {
     _arguments = arguments;
     do_parameters_on(this);