Native Windows

lahodaj · Jan 30, 2025 · 0414688 · 0414688
1 parent f5435d4
commit 0414688
Show file tree

Hide file tree

Showing 6 changed files with 261 additions and 1,020 deletions.
diff --git a/make/modules/jdk.internal.le/Lib.gmk b/make/modules/jdk.internal.le/Lib.gmk
@@ -27,7 +27,7 @@ include LibCommon.gmk
 
 ################################################################################
 
-ifeq ($(call isTargetOs, linux macosx), true)
+ifeq ($(call isTargetOs, linux macosx windows), true)
 
   $(eval $(call SetupJdkLibrary, BUILD_LIBLE, \
       NAME := le, \

diff --git a/.../internal/console/LastErrorException.java → .../internal/console/LastErrorException.java b/.../internal/console/LastErrorException.java → .../internal/console/LastErrorException.java
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/console/SimpleConsoleReader.java b/src/jdk.internal.le/share/classes/jdk/internal/console/SimpleConsoleReader.java
@@ -41,10 +41,9 @@ public static char[] doRead(Reader reader, Writer out, boolean password, int fir
         CleanableBuffer result = new CleanableBuffer();
         try {
             doReadImpl(reader, out, password, firstLineOffset, terminalWidthSupplier, result);
-            return result.data;
-        } catch (Throwable t) {
+            return Arrays.copyOf(result.data, result.length);
+        } finally {
             result.zeroOut();
-            throw t;
         }
     }