/hg/icedtea7-forest/jdk: 5 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Oct 26 17:36:05 UTC 2016
changeset 14a416fcd6b4 in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=14a416fcd6b4
author: coffeys
date: Thu Oct 15 09:33:03 2015 +0100
6907252, PR3162: ZipFileInputStream Not Thread-Safe
Reviewed-by: sherman
changeset 4fe1830bc1d6 in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=4fe1830bc1d6
author: aivanov
date: Wed Oct 26 16:05:53 2016 +0100
8130136, PR3162: Swing window sometimes fails to repaint partially when it becomes exposed
Reviewed-by: alexp, serb
changeset a9509bcc915f in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=a9509bcc915f
author: aefimov
date: Thu Jul 23 15:55:11 2015 +0300
8078495, PR3162: End time checking for native TGT is wrong
Reviewed-by: xuelei
changeset b163e8d8f24b in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=b163e8d8f24b
author: jgodinez
date: Mon Oct 24 09:58:47 2011 -0700
6604109, PR3162: javax.print.PrintServiceLookup.lookupPrintServices fails SOMETIMES for Cups
Reviewed-by: bae, prr
changeset 9619ed773fbd in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=9619ed773fbd
author: igerasim
date: Wed Oct 26 18:39:48 2016 +0100
8130274, PR3162: java/nio/file/FileStore/Basic.java fails when two successive stores in an iteration are determined to be equal
Summary: Make UnixFileStore.equals() also compare the return values of name(), the names of the mounted filesystems.
Reviewed-by: alanb
diffstat:
src/share/classes/java/util/zip/ZStreamRef.java | 2 +-
src/share/classes/java/util/zip/ZipFile.java | 9 +-
src/share/native/java/util/zip/zip_util.c | 18 +-
src/solaris/classes/sun/nio/fs/UnixFileStore.java | 5 +-
src/solaris/classes/sun/print/UnixPrintServiceLookup.java | 2 +-
src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.cpp | 8 +-
src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h | 3 +-
src/windows/native/sun/security/krb5/NativeCreds.c | 5 +-
src/windows/native/sun/windows/awt_Component.cpp | 14 +-
src/windows/native/sun/windows/awt_Component.h | 6 +-
test/java/util/zip/ZipFile/ZipEntryFreeTest.java | 130 ++++++++++
11 files changed, 176 insertions(+), 26 deletions(-)
diffs (415 lines):
diff -r 0ad544dbe717 -r 9619ed773fbd src/share/classes/java/util/zip/ZStreamRef.java
--- a/src/share/classes/java/util/zip/ZStreamRef.java Thu Oct 01 15:16:35 2015 +0900
+++ b/src/share/classes/java/util/zip/ZStreamRef.java Wed Oct 26 18:39:48 2016 +0100
@@ -31,7 +31,7 @@
class ZStreamRef {
- private long address;
+ private volatile long address;
ZStreamRef (long address) {
this.address = address;
}
diff -r 0ad544dbe717 -r 9619ed773fbd src/share/classes/java/util/zip/ZipFile.java
--- a/src/share/classes/java/util/zip/ZipFile.java Thu Oct 01 15:16:35 2015 +0900
+++ b/src/share/classes/java/util/zip/ZipFile.java Wed Oct 26 18:39:48 2016 +0100
@@ -54,7 +54,7 @@
*/
public
class ZipFile implements ZipConstants, Closeable {
- private long jzfile; // address of jzfile data
+ private long jzfile; // address of jzfile data
private final String name; // zip file name
private final int total; // total number of entries
private final boolean locsig; // if zip file starts with LOCSIG (usually true)
@@ -650,7 +650,7 @@
* (possibly compressed) zip file entry.
*/
private class ZipFileInputStream extends InputStream {
- private volatile boolean closeRequested = false;
+ private volatile boolean zfisCloseRequested = false;
protected long jzentry; // address of jzentry data
private long pos; // current position within entry data
protected long rem; // number of remaining bytes within entry
@@ -677,6 +677,7 @@
len = (int) rem;
}
+ // Check if ZipFile open
ensureOpenOrZipException();
len = ZipFile.read(ZipFile.this.jzfile, jzentry, pos, b,
off, len);
@@ -720,9 +721,9 @@
}
public void close() {
- if (closeRequested)
+ if (zfisCloseRequested)
return;
- closeRequested = true;
+ zfisCloseRequested = true;
rem = 0;
synchronized (ZipFile.this) {
diff -r 0ad544dbe717 -r 9619ed773fbd src/share/native/java/util/zip/zip_util.c
--- a/src/share/native/java/util/zip/zip_util.c Thu Oct 01 15:16:35 2015 +0900
+++ b/src/share/native/java/util/zip/zip_util.c Wed Oct 26 18:39:48 2016 +0100
@@ -1283,12 +1283,23 @@
jint
ZIP_Read(jzfile *zip, jzentry *entry, jlong pos, void *buf, jint len)
{
- jlong entry_size = (entry->csize != 0) ? entry->csize : entry->size;
+ jlong entry_size;
jlong start;
+ if (zip == 0) {
+ return -1;
+ }
+
/* Clear previous zip error */
zip->msg = NULL;
+ if (entry == 0) {
+ zip->msg = "ZIP_Read: jzentry is NULL";
+ return -1;
+ }
+
+ entry_size = (entry->csize != 0) ? entry->csize : entry->size;
+
/* Check specified position */
if (pos < 0 || pos > entry_size - 1) {
zip->msg = "ZIP_Read: specified offset out of range";
@@ -1419,6 +1430,11 @@
{
char *msg;
+ if (entry == 0) {
+ jio_fprintf(stderr, "jzentry was invalid");
+ return JNI_FALSE;
+ }
+
strcpy(entryname, entry->name);
if (entry->csize == 0) {
/* Entry is stored */
diff -r 0ad544dbe717 -r 9619ed773fbd src/solaris/classes/sun/nio/fs/UnixFileStore.java
--- a/src/solaris/classes/sun/nio/fs/UnixFileStore.java Thu Oct 01 15:16:35 2015 +0900
+++ b/src/solaris/classes/sun/nio/fs/UnixFileStore.java Wed Oct 26 18:39:48 2016 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2015, 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
@@ -186,7 +186,8 @@
return false;
UnixFileStore other = (UnixFileStore)ob;
return (this.dev == other.dev) &&
- Arrays.equals(this.entry.dir(), other.entry.dir());
+ Arrays.equals(this.entry.dir(), other.entry.dir()) &&
+ this.entry.name().equals(other.entry.name());
}
@Override
diff -r 0ad544dbe717 -r 9619ed773fbd src/solaris/classes/sun/print/UnixPrintServiceLookup.java
--- a/src/solaris/classes/sun/print/UnixPrintServiceLookup.java Thu Oct 01 15:16:35 2015 +0900
+++ b/src/solaris/classes/sun/print/UnixPrintServiceLookup.java Wed Oct 26 18:39:48 2016 +0100
@@ -240,7 +240,7 @@
if (printServices == null) {
return new PrintService[0];
} else {
- return printServices;
+ return (PrintService[])printServices.clone();
}
}
diff -r 0ad544dbe717 -r 9619ed773fbd src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.cpp
--- a/src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.cpp Thu Oct 01 15:16:35 2015 +0900
+++ b/src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.cpp Wed Oct 26 18:39:48 2016 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2015, 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
@@ -114,8 +114,9 @@
// which may've been disposed by this time, and we have
// no means of checking against it.
if (oldhDC != NULL) {
- MoveDCToPassiveList(oldhDC);
+ MoveDCToPassiveList(oldhDC, info->hWnd);
info->hDC = NULL;
+ info->hWnd = NULL;
}
if (wsdo->window != NULL){
@@ -150,6 +151,7 @@
// Finally, set these new values in the info for this thread
info->hDC = hDC;
+ info->hWnd = wsdo->window;
}
// cached brush and pen are not associated with any DC, and can be
@@ -187,7 +189,7 @@
if (info->hDC != NULL) {
// move the DC from the active dcs list to
// the passive dc list to be released later
- MoveDCToPassiveList(info->hDC);
+ MoveDCToPassiveList(info->hDC, info->hWnd);
}
if (info->clip != NULL) {
diff -r 0ad544dbe717 -r 9619ed773fbd src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h
--- a/src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h Thu Oct 01 15:16:35 2015 +0900
+++ b/src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h Wed Oct 26 18:39:48 2016 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2015, 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
@@ -196,6 +196,7 @@
*/
typedef struct {
HDC hDC;
+ HWND hWnd;
GDIWinSDOps *wsdo;
LONG wsdoTimeStamp; // wsdo creation time stamp.
// Other threads may deallocate wsdo
diff -r 0ad544dbe717 -r 9619ed773fbd src/windows/native/sun/security/krb5/NativeCreds.c
--- a/src/windows/native/sun/security/krb5/NativeCreds.c Thu Oct 01 15:16:35 2015 +0900
+++ b/src/windows/native/sun/security/krb5/NativeCreds.c Wed Oct 26 18:39:48 2016 +0100
@@ -389,7 +389,7 @@
jobject authTime, renewTillTime, hostAddresses = NULL;
KERB_EXTERNAL_TICKET *msticket;
int found = 0;
- FILETIME Now, EndTime, LocalEndTime;
+ FILETIME Now, EndTime;
int i, netypes;
jint *etypes = NULL;
@@ -472,8 +472,7 @@
GetSystemTimeAsFileTime(&Now);
EndTime.dwLowDateTime = msticket->EndTime.LowPart;
EndTime.dwHighDateTime = msticket->EndTime.HighPart;
- FileTimeToLocalFileTime(&EndTime, &LocalEndTime);
- if (CompareFileTime(&Now, &LocalEndTime) < 0) {
+ if (CompareFileTime(&Now, &EndTime) < 0) {
for (i=0; i<netypes; i++) {
if (etypes[i] == msticket->SessionKey.KeyType) {
found = 1;
diff -r 0ad544dbe717 -r 9619ed773fbd src/windows/native/sun/windows/awt_Component.cpp
--- a/src/windows/native/sun/windows/awt_Component.cpp Thu Oct 01 15:16:35 2015 +0900
+++ b/src/windows/native/sun/windows/awt_Component.cpp Wed Oct 26 18:39:48 2016 +0100
@@ -1370,7 +1370,7 @@
case WM_AWT_RELEASEDC:
{
HDC hDC = (HDC)wParam;
- MoveDCToPassiveList(hDC);
+ MoveDCToPassiveList(hDC, GetHWnd());
ReleaseDCList(GetHWnd(), passiveDCList);
mr = mrConsume;
break;
@@ -7103,8 +7103,8 @@
}
/**
- * Given a DC, remove it from the DC list and return
- * TRUE if it exists on the current list. Otherwise
+ * Given a DC and window handle, remove the DC from the DC list
+ * and return TRUE if it exists on the current list. Otherwise
* return FALSE.
* A DC may not exist on the list because it has already
* been released elsewhere (for example, the window
@@ -7112,14 +7112,14 @@
* thread may also want to release a DC when it notices that
* its DC is obsolete for the current window).
*/
-DCItem *DCList::RemoveDC(HDC hDC)
+DCItem *DCList::RemoveDC(HDC hDC, HWND hWnd)
{
listLock.Enter();
DCItem **prevPtrPtr = &head;
DCItem *listPtr = head;
while (listPtr) {
DCItem *nextPtr = listPtr->next;
- if (listPtr->hDC == hDC) {
+ if (listPtr->hDC == hDC && listPtr->hWnd == hWnd) {
*prevPtrPtr = nextPtr;
break;
}
@@ -7173,9 +7173,9 @@
listLock.Leave();
}
-void MoveDCToPassiveList(HDC hDC) {
+void MoveDCToPassiveList(HDC hDC, HWND hWnd) {
DCItem *removedDC;
- if ((removedDC = activeDCList.RemoveDC(hDC)) != NULL) {
+ if ((removedDC = activeDCList.RemoveDC(hDC, hWnd)) != NULL) {
passiveDCList.AddDCItem(removedDC);
}
}
diff -r 0ad544dbe717 -r 9619ed773fbd src/windows/native/sun/windows/awt_Component.h
--- a/src/windows/native/sun/windows/awt_Component.h Thu Oct 01 15:16:35 2015 +0900
+++ b/src/windows/native/sun/windows/awt_Component.h Wed Oct 26 18:39:48 2016 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2015, 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
@@ -901,13 +901,13 @@
void AddDC(HDC hDC, HWND hWnd);
void AddDCItem(DCItem *newItem);
- DCItem *RemoveDC(HDC hDC);
+ DCItem *RemoveDC(HDC hDC, HWND hWnd);
DCItem *RemoveAllDCs(HWND hWnd);
void RealizePalettes(int screen);
};
void ReleaseDCList(HWND hwnd, DCList &list);
-void MoveDCToPassiveList(HDC hDC);
+void MoveDCToPassiveList(HDC hDC, HWND hWnd);
namespace TimeHelper{
jlong getMessageTimeUTC();
diff -r 0ad544dbe717 -r 9619ed773fbd test/java/util/zip/ZipFile/ZipEntryFreeTest.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/java/util/zip/ZipFile/ZipEntryFreeTest.java Wed Oct 26 18:39:48 2016 +0100
@@ -0,0 +1,130 @@
+/*
+ * Copyright (c) 2015, 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.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/* @test
+ * @bug 6907252
+ * @summary ZipFileInputStream Not Thread-Safe
+ * @library /lib/testlibrary
+ * @build jdk.testlibrary.*
+ * @run main ZipEntryFreeTest
+ */
+
+import java.io.*;
+import java.nio.file.Paths;
+import java.util.Random;
+import java.util.Timer;
+import java.util.TimerTask;
+import java.util.zip.*;
+import jdk.testlibrary.FileUtils;
+
+public class ZipEntryFreeTest extends Thread {
+
+ private static final int NUM_THREADS = 5;
+ private static final int TEST_ITERATIONS = 5;
+ private static final String ZIPFILE_NAME = "large.zip";
+ private static final String ZIPENTRY_NAME = "random.txt";
+ private static InputStream is = null;
+ final Timer timer = new Timer();
+
+ public static void main(String args[]) throws Exception {
+ createZipFile();
+ try {
+ for (int i = 0; i < TEST_ITERATIONS; i++) {
+ runTest();
+ }
+ } finally {
+ FileUtils.deleteFileIfExistsWithRetry(Paths.get(ZIPFILE_NAME));
+ }
+ }
+
+ private static void runTest() throws Exception {
+ try (ZipFile zf = new ZipFile(new File(ZIPFILE_NAME))) {
+ is = zf.getInputStream(zf.getEntry(ZIPENTRY_NAME + "_0"));
+ Thread[] threadArray = new Thread[NUM_THREADS];
+ for (int i = 0; i < threadArray.length; i++) {
+ threadArray[i] = new ZipEntryFreeTest();
+ }
+ for (int i = 0; i < threadArray.length; i++) {
+ threadArray[i].start();
+ }
+ for (int i = 0; i < threadArray.length; i++) {
+ threadArray[i].join();
+ }
+ }
+ }
+
+ private static void createZipFile() throws Exception {
+ Random rnd = new Random(1000L);
+ byte[] contents = new byte[2_000_000];
+ ZipEntry ze = null;
+
+ try (ZipOutputStream zos =
+ new ZipOutputStream(new FileOutputStream(ZIPFILE_NAME))) {
+ // uncompressed mode seemed to tickle the crash
+ zos.setMethod(ZipOutputStream.STORED);
+ for (int ze_count = 0; ze_count < 10; ze_count++) {
+ rnd.nextBytes(contents);
+ ze = createZipEntry(contents, ze_count);
+ zos.putNextEntry(ze);
+ zos.write(contents, 0, contents.length);
+ }
+ zos.flush();
+ }
+ }
+
+ private static ZipEntry createZipEntry(byte[] b, int i) {
+ ZipEntry ze = new ZipEntry(ZIPENTRY_NAME + "_" + i);
+ ze.setCompressedSize(b.length);
+ ze.setSize(b.length);
+ CRC32 crc = new CRC32();
+ crc.update(b);
+ ze.setCrc(crc.getValue());
+ return ze;
+ }
+
+ @Override
+ public void run() {
+ try {
+ int iteration = 0;
+ TimerTask tt = (new TimerTask() {
+ @Override
+ public void run() {
+ try {
+ is.close();
+ } catch (Exception ex) {
+ ex.printStackTrace(System.out);
+ }
+ }
+ });
+ timer.schedule(tt, 50);
+ while (is.read() != -1 && iteration++ < 1_000) { }
+ } catch (ZipException ze) {
+ // ZipException now expected instead of ZIP_Read crash
+ System.out.println(ze);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ } finally {
+ timer.cancel();
+ }
+ }
+}
More information about the distro-pkg-dev
mailing list