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

8176379: java.util.Base64 mime encoder behaves incorrectly if initialized with a line length of size 1-3

Browse source 
Reviewed-by: rriggs, alanb, psandoz
This commit is contained in:
Xueming Shen 2018-01-31 10:34:59 -08:00
parent 46d5554295
commit 2f7bcc872f
3 changed files with 29 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/java.base/share/classes/java/util/Base64.java
View file

@ -116,8 +116,8 @@ public class Base64 {
*
* @param lineLength
* the length of each output line (rounded down to nearest multiple
* of 4). If {@code lineLength <= 0} the output will not be separated
* in lines
* of 4). If the rounded down line length is not a positive value,
* the output will not be separated in lines
* @param lineSeparator
* the line separator for each output line
*
@ -135,10 +135,12 @@ public class Base64 {
throw new IllegalArgumentException(
"Illegal base64 line separator character 0x" + Integer.toString(b, 16));
}
// round down to nearest multiple of 4
lineLength &= ~0b11;
if (lineLength <= 0) {
return Encoder.RFC4648;
}
return new Encoder(false, lineSeparator, lineLength >> 2 << 2, true);
return new Encoder(false, lineSeparator, lineLength, true);
}
/**