changeset 8255:d5fb2dd3be5f jdk7u80-b14

Merge
author asaha
date Thu, 09 Apr 2015 22:05:32 -0700
parents 6fbda5467858 da34e5f77e9e
children 36c6225e804b
files .hgtags test/sun/net/www/http/HttpClient/StreamingRetry.java
diffstat 2 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Mar 12 19:59:23 2015 +0000
+++ b/.hgtags	Thu Apr 09 22:05:32 2015 -0700
@@ -568,6 +568,7 @@
 fd0139b86bc186ebfc2715266b70da08b0af6132 jdk7u79-b11
 ed6e798f44e1698dfe766ee9e0763e035968c3a6 jdk7u79-b12
 efc8369247fc9ace2ce2008192349e1e49949e7d jdk7u79-b13
+2471c1dfff367fd75654eaeff608f0c32caa8171 jdk7u79-b14
 f33e6ea5f4832468dd86a8d48ef50479ce91111e jdk7u80-b06
 feb04280659bf05b567dc725ff53e2a2077bdbb7 jdk7u80-b07
 f1334857fa99e6472870986b6071f9405c29ced4 jdk7u80-b08
--- a/src/share/classes/sun/awt/image/BytePackedRaster.java	Thu Mar 12 19:59:23 2015 +0000
+++ b/src/share/classes/sun/awt/image/BytePackedRaster.java	Thu Apr 09 22:05:32 2015 -0700
@@ -1408,10 +1408,10 @@
             }
         }
 
-        int lastbit = (dataBitOffset
-                       + (height-1) * scanlineStride * 8
-                       + (width-1) * pixelBitStride
-                       + pixelBitStride - 1);
+        long lastbit = (long) dataBitOffset
+                       + (long) (height - 1) * (long) scanlineStride * 8
+                       + (long) (width - 1) * (long) pixelBitStride
+                       + (long) pixelBitStride - 1;
         if (lastbit < 0 || lastbit / 8 >= data.length) {
             throw new RasterFormatException("raster dimensions overflow " +
                                             "array bounds");