From 766bebffaa221c75eb036f54280812f34e98b130 Mon Sep 17 00:00:00 2001
From: pchelko <unknown>
Date: Wed, 4 Sep 2013 14:32:13 +0400
Subject: [PATCH] 8021943: FileDialog getFile returns corrupted string after
 previous setFile Reviewed-by: anthony, serb Contributed-by:
 alexander.zvegintsev@oracle.com

---
 src/windows/native/sun/windows/awt_FileDialog.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/windows/native/sun/windows/awt_FileDialog.cpp b/src/windows/native/sun/windows/awt_FileDialog.cpp
index d60fbd329..276f3647e 100644
--- a/src/windows/native/sun/windows/awt_FileDialog.cpp
+++ b/src/windows/native/sun/windows/awt_FileDialog.cpp
@@ -372,7 +372,9 @@ AwtFileDialog::Show(void *p)
 
         // Report result to peer.
         if (result) {
-            jint length = (jint)GetBufferLength(ofn.lpstrFile, ofn.nMaxFile);
+            jint length = multipleMode
+                    ? (jint)GetBufferLength(ofn.lpstrFile, ofn.nMaxFile)
+                    : (jint)_tcslen(ofn.lpstrFile);
             jcharArray jnames = env->NewCharArray(length);
             env->SetCharArrayRegion(jnames, 0, length, (jchar*)ofn.lpstrFile);
 
-- 
GitLab