Skip to content

Commit 64503c7

Browse files
committed
8357299: Graphics copyArea doesn't copy any pixels when there is overflow
Reviewed-by: achung, kizune, prr
1 parent a05f9de commit 64503c7

File tree

2 files changed

+69
-12
lines changed

2 files changed

+69
-12
lines changed

src/java.desktop/share/native/libawt/java2d/loops/Blit.c

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -74,19 +74,16 @@ Java_sun_java2d_loops_Blit_Blit
7474

7575
srcInfo.bounds.x1 = srcx;
7676
srcInfo.bounds.y1 = srcy;
77-
if (UNSAFE_TO_ADD(srcx, width) ||
78-
UNSAFE_TO_ADD(srcy, height) ||
79-
UNSAFE_TO_ADD(dstx, width) ||
80-
UNSAFE_TO_ADD(dsty, height)) {
81-
return;
82-
}
83-
84-
srcInfo.bounds.x2 = srcx + width;
85-
srcInfo.bounds.y2 = srcy + height;
77+
srcInfo.bounds.x2 = UNSAFE_TO_ADD(srcx, width)
78+
? clipInfo.bounds.x2 : (srcx + width);
79+
srcInfo.bounds.y2 = UNSAFE_TO_ADD(srcy, height)
80+
? clipInfo.bounds.y2 : (srcy + height);
8681
dstInfo.bounds.x1 = dstx;
8782
dstInfo.bounds.y1 = dsty;
88-
dstInfo.bounds.x2 = dstx + width;
89-
dstInfo.bounds.y2 = dsty + height;
83+
dstInfo.bounds.x2 = UNSAFE_TO_ADD(dstx, width)
84+
? clipInfo.bounds.x2 : (dstx + width);
85+
dstInfo.bounds.y2 = UNSAFE_TO_ADD(dsty, height)
86+
? clipInfo.bounds.y2 : (dsty + height);
9087
if (UNSAFE_TO_SUB(srcx, dstx) ||
9188
UNSAFE_TO_SUB(srcy, dsty)) {
9289
return;
Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
/*
2+
* Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
3+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4+
*
5+
* This code is free software; you can redistribute it and/or modify it
6+
* under the terms of the GNU General Public License version 2 only, as
7+
* published by the Free Software Foundation.
8+
*
9+
* This code is distributed in the hope that it will be useful, but WITHOUT
10+
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
11+
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
12+
* version 2 for more details (a copy is included in the LICENSE file that
13+
* accompanied this code).
14+
*
15+
* You should have received a copy of the GNU General Public License version
16+
* 2 along with this work; if not, write to the Free Software Foundation,
17+
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
18+
*
19+
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
20+
* or visit www.oracle.com if you need additional information or have any
21+
* questions.
22+
*/
23+
24+
/*
25+
* @test
26+
* @bug 8357299
27+
* @summary Verifies if Graphics copyArea doesn't copy any pixels
28+
* when there is overflow
29+
* @run main BrokenBoundsClip
30+
*/
31+
32+
import java.awt.Color;
33+
import java.awt.Graphics2D;
34+
import java.awt.image.BufferedImage;
35+
36+
import static java.awt.image.BufferedImage.TYPE_INT_RGB;
37+
38+
public final class BrokenBoundsClip {
39+
40+
public static final int SIZE = 100;
41+
42+
public static void main(String[] args) {
43+
BufferedImage bi = new BufferedImage(SIZE, SIZE, TYPE_INT_RGB);
44+
45+
Graphics2D g2d = bi.createGraphics();
46+
g2d.setColor(Color.RED);
47+
g2d.fillRect(SIZE / 2, SIZE / 2, SIZE / 2, SIZE / 2);
48+
49+
g2d.copyArea(bi.getWidth() / 2, bi.getHeight() / 2,
50+
Integer.MAX_VALUE , Integer.MAX_VALUE ,
51+
-bi.getWidth() / 2, -bi.getHeight() / 2);
52+
int actual = bi.getRGB(0, 0);
53+
int expected = Color.RED.getRGB();
54+
if (actual != expected) {
55+
System.err.println("Actual: " + Integer.toHexString(actual));
56+
System.err.println("Expected: " + Integer.toHexString(expected));
57+
throw new RuntimeException("Wrong color");
58+
}
59+
}
60+
}

0 commit comments

Comments
 (0)