# HG changeset patch

# User prr

# Date 1429299166 25200

#      Fri Apr 17 12:32:46 2015 -0700

# Node ID 1f4b038b9550afaf88a70cee4cf9c1422ecd86d6

# Parent  533117ae5b7587c8d9c0612581682ab984475430

8075942, PR3602: ArrayIndexOutOfBoundsException in sun.java2d.pisces.Dasher.goTo

Reviewed-by: flar, lbourges

diff --git openjdk.orig/jdk/src/share/classes/sun/java2d/pisces/Dasher.java openjdk/jdk/src/share/classes/sun/java2d/pisces/Dasher.java

--- openjdk.orig/jdk/src/share/classes/sun/java2d/pisces/Dasher.java

+++ openjdk/jdk/src/share/classes/sun/java2d/pisces/Dasher.java

@@ -146,7 +146,7 @@

         if (dashOn) {

             if (starting) {

                 firstSegmentsBuffer = Helpers.widenArray(firstSegmentsBuffer,

-                                      firstSegidx, type - 2);

+                                      firstSegidx, type - 2 + 1);

                 firstSegmentsBuffer[firstSegidx++] = type;

                 System.arraycopy(pts, off, firstSegmentsBuffer, firstSegidx, type - 2);

                 firstSegidx += type - 2;

diff --git a/test/javopenjdk.orig/jdk/awt/BasicStroke/DashStrokeTest.java openjdk/jdk/test/java/awt/BasicStroke/DashStrokeTest.java

new file mode 100644

--- /dev/null

+++ openjdk/jdk/test/java/awt/BasicStroke/DashStrokeTest.java

@@ -0,0 +1,69 @@

+/*

+ * Copyright (c) 2015, 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.

+ *

+ * @test

+ * @bug 8075942

+ * @summary test there is no exception rendering a dashed stroke

+ * @run DashStrokeTest

+ * @run -Dsun.java2d.renderer=sun.java2d.pisces.PiscesRenderingEngine

+ */

+

+import java.awt.BasicStroke;

+import java.awt.Color;

+import java.awt.Graphics2D;

+import java.awt.Stroke;

+import java.awt.geom.GeneralPath;

+import java.awt.image.BufferedImage;

+

+

+public class DashStrokeTest {

+

+    public static void main(String[] args) {

+

+        GeneralPath shape = new GeneralPath();

+        int[] pointTypes = {0, 0, 1, 1, 0, 1, 1, 0};

+        double[] xpoints = {428, 420, 400, 400, 400, 400, 420, 733};

+        double[] ypoints = {180, 180, 180, 160, 30, 10, 10, 10};

+        shape.moveTo(xpoints[0], ypoints[0]);

+        for (int i = 1; i < pointTypes.length; i++) {

+            if (pointTypes[i] == 1 && i < pointTypes.length - 1) {

+                shape.quadTo(xpoints[i], ypoints[i],

+                             xpoints[i + 1], ypoints[i + 1]);

+            } else {

+                shape.lineTo(xpoints[i], ypoints[i]);

+            }

+        }

+

+        BufferedImage image = new

+            BufferedImage(1000, 1000, BufferedImage.TYPE_INT_ARGB);

+        Graphics2D g2 = image.createGraphics();

+

+        Color color = new Color(124, 0, 124, 255);

+        g2.setColor(color);

+        Stroke stroke = new BasicStroke(1.0f,

+                                        BasicStroke.CAP_BUTT,

+                                        BasicStroke.JOIN_BEVEL,

+                                        10.0f, new float[] {9, 6}, 0.0f);

+        g2.setStroke(stroke);

+        g2.draw(shape);

+    }

+}