1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

8259943: FileDescriptor.close0 does not handle EINTR

Browse Source 
Reviewed-by: naoto, alanb
This commit is contained in:
Brian Burkhalter 2021-01-21 21:54:24 +00:00
parent a8073efeed
commit 2f47c39a74
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/java.base/unix/native/libjava/io_util_md.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2001, 2020, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -162,8 +162,17 @@ fileDescriptorClose(JNIEnv *env, jobject this)
dup2(devnull, fd); dup2(devnull, fd);
close(devnull); close(devnull);
} }
} else if (close(fd) == -1) { } else {
JNU_ThrowIOExceptionWithLastError(env, "close failed"); int result;
#if defined(_AIX)
/* AIX allows close to be restarted after EINTR */
RESTARTABLE(close(fd), result);
#else
result = close(fd);
#endif
if (result == -1 && errno != EINTR) {
JNU_ThrowIOExceptionWithLastError(env, "close failed");
}
} }
} }
@ -234,7 +243,9 @@ jlong
handleGetLength(FD fd) handleGetLength(FD fd)
{ {
struct stat64 sb; struct stat64 sb;
if (fstat64(fd, &sb) == 0) { int result;
RESTARTABLE(fstat64(fd, &sb), result);
if (result == 0) {
return sb.st_size; return sb.st_size;
} else { } else {
return -1; return -1;