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

8210285: CharsetDecoder/Encoder's constructor does not reject NaN

Browse source 
Reviewed-by: sherman, smarks, alanb, martin, darcy
This commit is contained in:
Ivan Gerasimov 2018-09-06 12:10:59 -07:00
parent d1958eeed1
commit 1c9dfca05b
3 changed files with 143 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,5 @@
/*
* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2000, 2018, 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
@ -189,10 +189,12 @@ public abstract class Charset$Coder$ {
$replType$ replacement)
{
this.charset = cs;
if (average$ItypesPerOtype$ <= 0.0f)
// Use !(a > 0.0f) rather than (a <= 0.0f) to exclude NaN values
if (!(average$ItypesPerOtype$ > 0.0f))
throw new IllegalArgumentException("Non-positive "
+ "average$ItypesPerOtype$");
if (max$ItypesPerOtype$ <= 0.0f)
// Use !(a > 0.0f) rather than (a <= 0.0f) to exclude NaN values
if (!(max$ItypesPerOtype$ > 0.0f))
throw new IllegalArgumentException("Non-positive "
+ "max$ItypesPerOtype$");
if (average$ItypesPerOtype$ > max$ItypesPerOtype$)