Changeset 390 for trunk/openjdk/jdk/src/share/native

Timestamp:

Jul 2, 2012, 3:05:26 PM (13 years ago)

Author:

dmik

Message:

trunk: Merged in openjdk6 b25 from branches/vendor/oracle.

This accompanies an incomplete r389.

Location:

trunk/openjdk/jdk/src/share/native

Files:

• java/util/zip/zip_util.c (modified) (2 diffs)
• sun/awt/image/jpeg/imageioJPEG.c (modified) (1 diff)

trunk/openjdk/jdk/src/share/native/java/util/zip/zip_util.c

@@ -1 +1 @@
 /*
- * Copyright (c) 1995, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -451 +451 @@
     jint count = 0;
     ptrdiff_t i;
-    for (i = 0; i + CENHDR < end - beg; i += CENSIZE(beg + i))
+    for (i = 0; i + CENHDR <= end - beg; i += CENSIZE(beg + i))
         count++;
     return count;

trunk/openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *