github/SlimeVR-Server
1
1
Fork 0
mirror of https://github.com/SlimeVR/SlimeVR-Server.git synced 2026-04-06 02:01:58 +02:00
Code Issues 161 Packages Projects Releases Wiki Activity

Fix erroneous sign extension in Protobuf IPC packet handling (#1318)

Browse Source
This commit is contained in:
rcelyte
2025-03-04 15:12:16 +00:00
committed by GitHub
parent 6b7ec2adc6
commit 2c5ec62c11
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/desktop/src/main/java/dev/slimevr/desktop/platform/linux/UnixSocketBridge.java
View File

@@ -25,7 +25,7 @@ import java.util.List;
public class UnixSocketBridge extends SteamVRBridge implements AutoCloseable {
public final String socketPath;
public final UnixDomainSocketAddress socketAddress;
private final ByteBuffer dst = ByteBuffer.allocate(2048);
private final ByteBuffer dst = ByteBuffer.allocate(2048).order(ByteOrder.LITTLE_ENDIAN);
private final ByteBuffer src = ByteBuffer.allocate(2048).order(ByteOrder.LITTLE_ENDIAN);
private ServerSocketChannel server;
@@ -163,7 +163,7 @@ public class UnixSocketBridge extends SteamVRBridge implements AutoCloseable {
// if buffer has 4 bytes at least, we got the message size!
// processs all messages
while (dst.position() >= 4) {
int messageLength = dst.get(0) | dst.get(1) << 8 | dst.get(2) << 16 | dst.get(3) << 24;
int messageLength = dst.getInt(0);
if (messageLength > 1024) { // Overflow
LogManager
.severe(

8
server/desktop/src/main/java/dev/slimevr/desktop/platform/windows/WindowsNamedPipeBridge.java
View File

@@ -181,10 +181,10 @@ public class WindowsNamedPipeBridge extends SteamVRBridge {
if (bytesAvailable.getValue() < 4) {
return readAnything; // Wait for more data
}
int messageLength = (buffArray[3] << 24)
| (buffArray[2] << 16)
| (buffArray[1] << 8)
| buffArray[0];
int messageLength = (Byte.toUnsignedInt(buffArray[3]) << 24)
| (Byte.toUnsignedInt(buffArray[2]) << 16)
| (Byte.toUnsignedInt(buffArray[1]) << 8)
| Byte.toUnsignedInt(buffArray[0]);
if (messageLength > 1024) { // Overflow
setPipeError("Pipe overflow. Message length: " + messageLength);
return readAnything;