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

8272613: CharsetDecoder.decode(ByteBuffer) throws IllegalArgumentException

Browse source 
Reviewed-by: alanb, bpb
This commit is contained in:
Naoto Sato 2023-03-29 16:08:57 +00:00
parent 014c658708
commit f07decb74b
2 changed files with 98 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/java.base/share/classes/java/nio/charset/Charset-X-Coder.java.template
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2000, 2023, 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
@ -35,6 +35,7 @@ import java.nio.BufferUnderflowException;
import java.lang.ref.WeakReference;
import java.nio.charset.CoderMalfunctionError; // javadoc
import java.util.Arrays;
import jdk.internal.util.ArraysSupport;
/**
@ -791,11 +792,16 @@ public abstract class Charset$Coder$ {
* position cannot be mapped to an equivalent $otype$ sequence and
* the current unmappable-character action is {@link
* CodingErrorAction#REPORT}
*
* @throws OutOfMemoryError
* If the output $otype$ buffer for the requested size of the input
* $itype$ buffer cannot be allocated
*/
public final $Otype$Buffer $code$($Itype$Buffer in)
throws CharacterCodingException
{
int n = (int)(in.remaining() * average$ItypesPerOtype$());
int n = Math.min((int)(in.remaining() * average$ItypesPerOtype$()),
ArraysSupport.SOFT_MAX_ARRAY_LENGTH);
$Otype$Buffer out = $Otype$Buffer.allocate(n);
if ((n == 0) && (in.remaining() == 0))
@ -810,7 +816,8 @@ public abstract class Charset$Coder$ {
if (cr.isUnderflow())
break;
if (cr.isOverflow()) {
n = 2*n + 1; // Ensure progress; n might be 0!
// Ensure progress; n might be 0!
n = ArraysSupport.newLength(n, Math.min(n + 1, 1_024), n + 1);
$Otype$Buffer o = $Otype$Buffer.allocate(n);
out.flip();
o.put(out);