8321409: Console read line with zero out should zero out underlying b…

…uffer in JLine (redux) Reviewed-by: alanb
openjdk · Dec 7, 2023 · 4ed38f5 · 4ed38f5 · openjdk-notifier · Dec 7, 2023
1 parent fe4c0a2
commit 4ed38f5
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/JdkConsoleProviderImpl.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/JdkConsoleProviderImpl.java
@@ -114,7 +114,7 @@ public char[] readPassword(String fmt, Object ... args) {
             } catch (EndOfFileException eofe) {
                 return null;
             } finally {
-                jline.getBuffer().zeroOut();
+                jline.zeroOut();
             }
         }
 

diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/LineReader.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/LineReader.java
@@ -750,4 +750,9 @@ enum SuggestionType {
     void setAutosuggestion(SuggestionType type);
 
     SuggestionType getAutosuggestion();
+
+    // JDK specific modification
+    default void zeroOut() {
+        throw new UnsupportedOperationException();
+    }
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/LineReaderImpl.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/LineReaderImpl.java
@@ -6250,4 +6250,10 @@ private void rebind(KeyMap<Binding> keyMap, String operation, String prevBinding
         }
     }
 
+    // JDK specific modification
+    @Override
+    public void zeroOut() {
+        buf.zeroOut();
+        parsedLine = null;
+    }
 }