commit 55dab103c24bf86cf025b9ce02b67e72508d41ba
author Alexey Ushakov <Alexey.Ushakov@jetbrains.com> Mon Aug 29 15:45:16 2016 +0300
committer Alexey Ushakov <Alexey.Ushakov@jetbrains.com> Mon Aug 29 15:45:59 2016 +0300
tree 8e1d7333024831e1357a3bc0c904dafaa72c9c3c
parent 2e7d270b931d0dcf07b603df0f6901f7875fbd0b

JRE-18 CCE in XRMaskFill.MaskFill

Throwing InvalidPipeException for incompatible surfaces

src/solaris/classes/sun/java2d/xr/XRMaskFill.java

diff --git a/src/solaris/classes/sun/java2d/xr/XRMaskFill.java b/src/solaris/classes/sun/java2d/xr/XRMaskFill.java
index 8be8457..6d484ff 100644
--- a/src/solaris/classes/sun/java2d/xr/XRMaskFill.java
+++ b/src/solaris/classes/sun/java2d/xr/XRMaskFill.java
@@ -99,7 +99,12 @@
         try {
             SunToolkit.awtLock();
 
-            XRSurfaceData x11sd = (XRSurfaceData) sData;
+            XRSurfaceData x11sd;
+            try {
+                x11sd = (XRSurfaceData) sData;
+            } catch (ClassCastException e) {
+                throw new InvalidPipeException("wrong surface data type: " + sData);
+            }
             x11sd.validateAsDestination(null, sg2d.getCompClip());
 
             XRCompositeManager maskBuffer = x11sd.maskBuffer;