src/share/classes/sun/awt/image/ShortBandedRaster.java

*** 1,7 ****
  /*
!  * Copyright (c) 1997, 2007, 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.  Oracle designates this
--- 1,7 ----
  /*
!  * Copyright (c) 1997, 2014, 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.  Oracle designates this
*** 752,767 ****
--- 752,778 ----
              // integer overflow
              throw new RasterFormatException("Incorrect scanline stride: "
                      + scanlineStride);
          }
  
+         if ((long)minX - sampleModelTranslateX < 0 ||
+             (long)minY - sampleModelTranslateY < 0) {
+ 
+             throw new RasterFormatException("Incorrect origin/translate: (" +
+                     minX + ", " + minY + ") / (" +
+                     sampleModelTranslateX + ", " + sampleModelTranslateY + ")");
+         }
+ 
+         if (height > 1 || minY - sampleModelTranslateY > 0) {
+             // buffer should contain at least one scanline
              for (int i = 0; i < data.length; i++) {
                  if (scanlineStride > data[i].length) {
                      throw new RasterFormatException("Incorrect scanline stride: "
                          + scanlineStride);
                  }
              }
+         }
  
          // Make sure data for Raster is in a legal range
          for (int i=0; i < dataOffsets.length; i++) {
              if (dataOffsets[i] < 0) {
                  throw new RasterFormatException("Data offsets for band "+i+