# HG changeset patch # User jlaskey # Date 1464368548 10800 # Node ID 96ea53771693b1436609f803d3e77c7d19040519 # Parent d887ee89eec0d3aabc1205adb6ff5ad334e78381 8158061: Additional argument checks to BasicImageReader calls Reviewed-by: alanb, coffeys diff -r d887ee89eec0 -r 96ea53771693 jdk/src/java.base/share/classes/jdk/internal/jimage/ImageStringsReader.java --- a/jdk/src/java.base/share/classes/jdk/internal/jimage/ImageStringsReader.java Fri May 27 08:52:22 2016 -0700 +++ b/jdk/src/java.base/share/classes/jdk/internal/jimage/ImageStringsReader.java Fri May 27 14:02:28 2016 -0300 @@ -57,14 +57,14 @@ private static int hashCode(byte[] bytes, int offset, int count, int seed) { Objects.requireNonNull(bytes); - if (offset < 0 || offset >= bytes.length) { - throw new IndexOutOfBoundsException("offset"); + if (offset < 0 || count < 0 || offset > bytes.length - count) { + throw new IndexOutOfBoundsException("offset=" + offset + ", count=" + count); } int limit = offset + count; if (limit < 0 || limit > bytes.length) { - throw new IndexOutOfBoundsException("limit"); + throw new IndexOutOfBoundsException("limit=" + limit); } for (int i = offset; i < limit; i++) {