archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-26 06:14:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8349664: HEX dump should always use ASCII or ISO_8859_1

Browse source 
Reviewed-by: weijun
This commit is contained in:
Mikhail Yankelevich 2025-02-19 18:56:26 +00:00 • committed by Weijun Wang
parent 7631984525
commit 7734f8ed13
2 changed files with 104 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/java.base/share/classes/sun/security/util/HexDumpEncoder.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 1995, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1995, 2025, 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
@ -84,7 +84,7 @@ public class HexDumpEncoder {
protected void encodeBufferPrefix(OutputStream o) throws IOException {
offset = 0;
pStream = new PrintStream(o);
pStream = new PrintStream(o, false, ISO_8859_1);
}
protected void encodeLinePrefix(OutputStream o, int len) {
@ -303,6 +303,8 @@ public class HexDumpEncoder {
/**
* A 'streamless' version of encode that simply takes a buffer of
* bytes and returns a string containing the encoded buffer.
* <P>
* Returned string is encoded with the ISO-8859-1, also known as ISO-LATIN-1.
*/
public String encodeBuffer(byte[] aBuffer) {
ByteArrayOutputStream outStream = new ByteArrayOutputStream();
@ -313,7 +315,7 @@ public class HexDumpEncoder {
// This should never happen.
throw new Error("CharacterEncoder.encodeBuffer internal error");
}
return (outStream.toString());
return (outStream.toString(ISO_8859_1));
}
/**