8256461: AbstractFileSystemProvider.getSunPathForSocketCall for empty Path returns '.'

Reviewed-by: dfuchs, alanb
This commit is contained in:
Michael McMahon 2020-11-18 08:43:51 +00:00
parent d30956055b
commit 6948456dbf
5 changed files with 60 additions and 3 deletions

View file

@ -105,6 +105,9 @@ class UnixDomainSockets {
static void bind(FileDescriptor fd, Path addr) throws IOException {
byte[] path = getPathBytes(addr);
if (path.length == 0) {
throw new BindException("Server socket cannot bind to unnamed address");
}
bind0(fd, path);
}

View file

@ -158,6 +158,7 @@ public abstract class AbstractFileSystemProvider extends FileSystemProvider {
/**
* Returns a path name as bytes for a Unix domain socket.
* Different encodings may be used for these names on some platforms.
* If path is empty, then an empty byte[] is returned.
*/
public abstract byte[] getSunPathForSocketFile(Path file);
public abstract byte[] getSunPathForSocketFile(Path path);
}

View file

@ -48,6 +48,7 @@ public abstract class UnixFileSystemProvider
extends AbstractFileSystemProvider
{
private static final String USER_DIR = "user.dir";
private static final byte[] EMPTY_PATH = new byte[0];
private final UnixFileSystem theFileSystem;
public UnixFileSystemProvider() {
@ -568,6 +569,9 @@ public abstract class UnixFileSystemProvider
@Override
public byte[] getSunPathForSocketFile(Path obj) {
UnixPath file = UnixPath.toUnixPath(obj);
if (file.isEmpty()) {
return EMPTY_PATH;
}
return file.getByteArrayForSysCalls();
}
}

View file

@ -46,7 +46,7 @@ import static sun.nio.fs.WindowsConstants.*;
class WindowsFileSystemProvider
extends AbstractFileSystemProvider
{
private static final Unsafe unsafe = Unsafe.getUnsafe();
private static final byte[] EMPTY_PATH = new byte[0];
private final WindowsFileSystem theFileSystem;
@ -628,7 +628,7 @@ class WindowsFileSystemProvider
public byte[] getSunPathForSocketFile(Path obj) {
WindowsPath file = WindowsPath.toWindowsPath(obj);
String s = file.toString();
return s.getBytes(StandardCharsets.UTF_8);
return s.isEmpty() ? EMPTY_PATH : s.getBytes(StandardCharsets.UTF_8);
}
}