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

8190289: More refactoring for client deserialization cases

Browse source 
Reviewed-by: prr, azvegint, rhalade, skoivu
This commit is contained in:
Sergey Bylokhov 2017-11-06 10:24:42 -08:00
parent 250b374e54
commit 7f2f3c08cb
2 changed files with 23 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/java.desktop/share/classes/java/awt/geom/Path2D.java
View file

@ -25,13 +25,14 @@
package java.awt.geom;
import java.awt.Shape;
import java.awt.Rectangle;
import sun.awt.geom.Curve;
import java.awt.Shape;
import java.io.Serializable;
import java.io.StreamCorruptedException;
import java.util.Arrays;
import sun.awt.geom.Curve;
/**
* The {@code Path2D} class provides a simple, yet flexible
* shape which represents an arbitrary geometric path.
@ -2625,9 +2626,12 @@ public abstract class Path2D implements Shape, Cloneable {
throw new java.io.InvalidObjectException(iae.getMessage());
}
pointTypes = new byte[(nT < 0) ? INIT_SIZE : nT];
if (nC < 0) {
nC = INIT_SIZE * 2;
// Accept the size from the stream only if it is less than INIT_SIZE
// otherwise the size will be based on the real data in the stream
pointTypes = new byte[(nT < 0 || nT > INIT_SIZE) ? INIT_SIZE : nT];
final int initX2 = INIT_SIZE * 2;
if (nC < 0 || nC > initX2) {
nC = initX2;
}
if (storedbl) {
((Path2D.Double) this).doubleCoords = new double[nC];