Skip to content

Fix server crash from invalid network payload ID deserialization #63

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Spagles wants to merge 3 commits into
base: dev
Choose a base branch
from
+16 −1
Open

Fix server crash from invalid network payload ID deserialization #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
29dcf02
fix: prevent ArrayIndexOutOfBoundsException in dedicated server packe…
Spagles Aug 1, 2026
3f9fec9
fix: add bounds checking to payload ID deserialization in VisorCorePa…
Spagles Aug 1, 2026
dd1e713
fix: handle null payload ID in server packet reader
Spagles Aug 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions visor-api/src/main/java/org/vmstudio/visor/api/common/network/VisorCorePayloadID.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,21 @@ public byte byteOrdinal() {
public static VisorCorePayloadID fromOrdinal(byte ordinalByte){
// -127...127 to 0..255
int unsignedByte = ordinalByte & 0xFF;
if (unsignedByte >= values().length) {
return null;
}
return values()[unsignedByte];
}

@Environment(EnvType.CLIENT)
public static VisorPayloadToClient readToClient(VisorCorePayloadID payloadID,
FriendlyByteBuf buffer) {
if (payloadID == null) {
VisorAPI.client().getLogger().error(
"Visor: Got unexpected payload identifier on client: null"
);
return UnknownPayloadToClient.read(buffer);
}
return switch (payloadID) {
case HANDSHAKE -> HandshakePayloadToClient.read(buffer);
case SERVER_SETTINGS -> SettingsPayloadToClient.read(buffer);
Expand All @@ -88,6 +97,12 @@ public static VisorPayloadToClient readToClient(VisorCorePayloadID payloadID,

public static VisorPayloadToServer readToServer(VisorCorePayloadID payloadID,
FriendlyByteBuf buffer) {
if (payloadID == null) {
VisorAPI.server().getLogger().error(
"Visor: Got unexpected payload identifier on server: null"
);
return UnknownPayloadToServer.read(buffer);
}
return switch (payloadID) {
case HANDSHAKE -> HandshakePayloadToServer.read(buffer);
case ACTIVE_HAND -> ActiveHandPayloadToServer.read(buffer);
Expand Down
2 changes: 1 addition & 1 deletion visor-core/src/main/java/org/vmstudio/visor/core/server/network/ServerNetworking.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public static void createDedicatedChannel(@NotNull CoreAddonServer coreAddon){
VisorNetwork.CORE_NETWORK_VERSION
).toServer(
(id, buffer)->{
VisorCorePayloadID payloadId = VisorCorePayloadID.values()[id];
VisorCorePayloadID payloadId = VisorCorePayloadID.fromOrdinal(id);
return VisorCorePayloadID.readToServer(payloadId, buffer);
},
ServerPacketHandler::handlePacket
Expand Down