Skip to content

Commit

Permalink
6606673: Path2D.Double, Path2D.Float and GeneralPath ctors throw exce…
Browse files Browse the repository at this point in the history
…ption when initialCapacity is negative

Reviewed-by: psadhukhan, kizune
  • Loading branch information
mrserb committed Jan 27, 2021
1 parent 6f2be9c commit e1411fd
Show file tree
Hide file tree
Showing 4 changed files with 218 additions and 0 deletions.
7 changes: 7 additions & 0 deletions src/java.desktop/share/classes/java/awt/geom/GeneralPath.java
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ public GeneralPath() {
* path to be defined.
*
* @param rule the winding rule
* @throws IllegalArgumentException if {@code rule} is not either
* {@link #WIND_EVEN_ODD} or {@link #WIND_NON_ZERO}
* @see #WIND_EVEN_ODD
* @see #WIND_NON_ZERO
* @since 1.2
Expand All @@ -85,6 +87,10 @@ public GeneralPath(int rule) {
* @param rule the winding rule
* @param initialCapacity the estimate for the number of path segments
* in the path
* @throws IllegalArgumentException if {@code rule} is not either
* {@link #WIND_EVEN_ODD} or {@link #WIND_NON_ZERO}
* @throws NegativeArraySizeException if {@code initialCapacity} is
* negative
* @see #WIND_EVEN_ODD
* @see #WIND_NON_ZERO
* @since 1.2
Expand All @@ -100,6 +106,7 @@ public GeneralPath(int rule, int initialCapacity) {
* taken from the specified {@code Shape} object.
*
* @param s the specified {@code Shape} object
* @throws NullPointerException if {@code s} is {@code null}
* @since 1.2
*/
public GeneralPath(Shape s) {
Expand Down
19 changes: 19 additions & 0 deletions src/java.desktop/share/classes/java/awt/geom/Path2D.java
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,9 @@ public abstract class Path2D implements Shape, Cloneable {
* @param rule the winding rule
* @param initialTypes the size to make the initial array to
* store the path segment types
* @throws IllegalArgumentException if {@code rule} is not either
* {@link #WIND_EVEN_ODD} or {@link #WIND_NON_ZERO}
* @throws NegativeArraySizeException if {@code initialTypes} is negative
* @since 1.6
*/
/* private protected */
Expand Down Expand Up @@ -207,6 +210,8 @@ public Float() {
* require the interior of the path to be defined.
*
* @param rule the winding rule
* @throws IllegalArgumentException if {@code rule} is not either
* {@link #WIND_EVEN_ODD} or {@link #WIND_NON_ZERO}
* @see #WIND_EVEN_ODD
* @see #WIND_NON_ZERO
* @since 1.6
Expand All @@ -226,6 +231,10 @@ public Float(int rule) {
* @param rule the winding rule
* @param initialCapacity the estimate for the number of path segments
* in the path
* @throws IllegalArgumentException if {@code rule} is not either
* {@link #WIND_EVEN_ODD} or {@link #WIND_NON_ZERO}
* @throws NegativeArraySizeException if {@code initialCapacity} is
* negative
* @see #WIND_EVEN_ODD
* @see #WIND_NON_ZERO
* @since 1.6
Expand All @@ -242,6 +251,7 @@ public Float(int rule, int initialCapacity) {
* taken from the specified {@code Shape} object.
*
* @param s the specified {@code Shape} object
* @throws NullPointerException if {@code s} is {@code null}
* @since 1.6
*/
public Float(Shape s) {
Expand All @@ -258,6 +268,7 @@ public Float(Shape s) {
*
* @param s the specified {@code Shape} object
* @param at the specified {@code AffineTransform} object
* @throws NullPointerException if {@code s} is {@code null}
* @since 1.6
*/
public Float(Shape s, AffineTransform at) {
Expand Down Expand Up @@ -1101,6 +1112,8 @@ public Double() {
* require the interior of the path to be defined.
*
* @param rule the winding rule
* @throws IllegalArgumentException if {@code rule} is not either
* {@link #WIND_EVEN_ODD} or {@link #WIND_NON_ZERO}
* @see #WIND_EVEN_ODD
* @see #WIND_NON_ZERO
* @since 1.6
Expand All @@ -1120,6 +1133,10 @@ public Double(int rule) {
* @param rule the winding rule
* @param initialCapacity the estimate for the number of path segments
* in the path
* @throws IllegalArgumentException if {@code rule} is not either
* {@link #WIND_EVEN_ODD} or {@link #WIND_NON_ZERO}
* @throws NegativeArraySizeException if {@code initialCapacity} is
* negative
* @see #WIND_EVEN_ODD
* @see #WIND_NON_ZERO
* @since 1.6
Expand All @@ -1136,6 +1153,7 @@ public Double(int rule, int initialCapacity) {
* taken from the specified {@code Shape} object.
*
* @param s the specified {@code Shape} object
* @throws NullPointerException if {@code s} is {@code null}
* @since 1.6
*/
public Double(Shape s) {
Expand All @@ -1152,6 +1170,7 @@ public Double(Shape s) {
*
* @param s the specified {@code Shape} object
* @param at the specified {@code AffineTransform} object
* @throws NullPointerException if {@code s} is {@code null}
* @since 1.6
*/
public Double(Shape s, AffineTransform at) {
Expand Down
70 changes: 70 additions & 0 deletions test/jdk/java/awt/geom/GeneralPath/GeneralPathExceptions.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
/*
* Copyright (c) 2021, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/

import java.awt.geom.GeneralPath;

import static java.awt.geom.Path2D.WIND_EVEN_ODD;
import static java.awt.geom.Path2D.WIND_NON_ZERO;

/*
* @test
* @bug 6606673
* @summary The test checks if correct exceptions are thrown by the constructors
*/
public final class GeneralPathExceptions {

public static void main(String[] args) {
try {
new GeneralPath(null);
throw new RuntimeException("NullPointerException is expected");
} catch (NullPointerException ignore) {
// expected
}

try {
new GeneralPath(-1);
throw new RuntimeException("IllegalArgumentException is expected");
} catch (IllegalArgumentException ignore) {
// expected
}
try {
new GeneralPath(-1, 0);
throw new RuntimeException("IllegalArgumentException is expected");
} catch (IllegalArgumentException ignore) {
// expected
}

try {
new GeneralPath(WIND_EVEN_ODD, -1);
throw new RuntimeException("NegativeArraySizeException is expected");
} catch (NegativeArraySizeException ignore) {
// expected
}
try {
new GeneralPath(WIND_NON_ZERO, -1);
throw new RuntimeException("NegativeArraySizeException is expected");
} catch (NegativeArraySizeException ignore) {
// expected
}
}
}
122 changes: 122 additions & 0 deletions test/jdk/java/awt/geom/Path2D/Path2DExceptions.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,122 @@
/*
* Copyright (c) 2021, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/

import java.awt.geom.Path2D;

import static java.awt.geom.Path2D.WIND_EVEN_ODD;
import static java.awt.geom.Path2D.WIND_NON_ZERO;

/*
* @test
* @bug 6606673
* @summary The test checks if correct exceptions are thrown by the constructors
*/
public final class Path2DExceptions {

public static void main(String[] args) {
testFloat();
testDouble();
}

private static void testFloat() {
try {
new Path2D.Float(null);
throw new RuntimeException("NullPointerException is expected");
} catch (NullPointerException ignore) {
// expected
}
try {
new Path2D.Float(null, null);
throw new RuntimeException("NullPointerException is expected");
} catch (NullPointerException ignore) {
// expected
}

try {
new Path2D.Float(-1);
throw new RuntimeException("IllegalArgumentException is expected");
} catch (IllegalArgumentException ignore) {
// expected
}
try {
new Path2D.Float(-1, 0);
throw new RuntimeException("IllegalArgumentException is expected");
} catch (IllegalArgumentException ignore) {
// expected
}

try {
new Path2D.Float(WIND_EVEN_ODD, -1);
throw new RuntimeException("NegativeArraySizeException is expected");
} catch (NegativeArraySizeException ignore) {
// expected
}
try {
new Path2D.Float(WIND_NON_ZERO, -1);
throw new RuntimeException("NegativeArraySizeException is expected");
} catch (NegativeArraySizeException ignore) {
// expected
}
}

private static void testDouble() {
try {
new Path2D.Double(null);
throw new RuntimeException("NullPointerException is expected");
} catch (NullPointerException ignore) {
// expected
}
try {
new Path2D.Double(null, null);
throw new RuntimeException("NullPointerException is expected");
} catch (NullPointerException ignore) {
// expected
}

try {
new Path2D.Double(-1);
throw new RuntimeException("IllegalArgumentException is expected");
} catch (IllegalArgumentException ignore) {
// expected
}
try {
new Path2D.Double(-1, 0);
throw new RuntimeException("IllegalArgumentException is expected");
} catch (IllegalArgumentException ignore) {
// expected
}

try {
new Path2D.Double(WIND_EVEN_ODD, -1);
throw new RuntimeException("NegativeArraySizeException is expected");
} catch (NegativeArraySizeException ignore) {
// expected
}
try {
new Path2D.Double(WIND_NON_ZERO, -1);
throw new RuntimeException("NegativeArraySizeException is expected");
} catch (NegativeArraySizeException ignore) {
// expected
}
}
}

1 comment on commit e1411fd

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.