From 03171c61f7f73e2be56d959731b1297ef982e5b4 Mon Sep 17 00:00:00 2001 From: sherman Date: Fri, 30 Oct 2009 13:01:16 -0700 Subject: [PATCH] 6894950: test/java/util/zip/Bounds.java fails with OoutOfMemoryError Summary: Fixed the boundary check in Deflater.java Reviewed-by: alanb --- src/share/classes/java/util/zip/Deflater.java | 2 +- test/java/util/zip/Bounds.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/share/classes/java/util/zip/Deflater.java b/src/share/classes/java/util/zip/Deflater.java index 54d844424..e592ce0df 100644 --- a/src/share/classes/java/util/zip/Deflater.java +++ b/src/share/classes/java/util/zip/Deflater.java @@ -333,7 +333,7 @@ class Deflater { * output buffer */ public int deflate(byte[] b, int off, int len) { - return deflateBytes(b, off, len, NO_FLUSH); + return deflate(b, off, len, NO_FLUSH); } /** diff --git a/test/java/util/zip/Bounds.java b/test/java/util/zip/Bounds.java index 281ba2864..ede047747 100644 --- a/test/java/util/zip/Bounds.java +++ b/test/java/util/zip/Bounds.java @@ -22,8 +22,7 @@ */ /* @test - * @bug 4811913 - * @ignore until 6896424 is resolved + * @bug 4811913 6894950 * @summary Test bounds checking in zip package */ -- GitLab