From ac5204d46b29913cace0f95a323e90219eba938f Mon Sep 17 00:00:00 2001 From: Isaac0-dev <62234577+Isaac0-dev@users.noreply.github.com> Date: Wed, 1 Mar 2023 11:45:17 +1000 Subject: [PATCH] fix client crash when incompatible tag is null (#300) * rerun autogen * give clients access to mod incompatible tags And fix a crash when warping to the cake end picture * whoops * fix client crash --- src/pc/network/packets/packet_mod_list.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/pc/network/packets/packet_mod_list.c b/src/pc/network/packets/packet_mod_list.c index 6582a5d9..d753de56 100644 --- a/src/pc/network/packets/packet_mod_list.c +++ b/src/pc/network/packets/packet_mod_list.c @@ -67,7 +67,11 @@ void network_send_mod_list(void) { packet_write(&p, &nameLength, sizeof(u16)); packet_write(&p, mod->name, sizeof(u8) * nameLength); packet_write(&p, &incompatibleLength, sizeof(u16)); - packet_write(&p, mod->incompatible, sizeof(u8) * incompatibleLength); + if (mod->incompatible) { + packet_write(&p, mod->incompatible, sizeof(u8) * incompatibleLength); + } else { + packet_write(&p, "", 0); + } packet_write(&p, &relativePathLength, sizeof(u16)); packet_write(&p, mod->relativePath, sizeof(u8) * relativePathLength); packet_write(&p, &modSize, sizeof(u64)); @@ -196,9 +200,13 @@ void network_receive_mod_list_entry(struct Packet* p) { } // get incompatible - char incompatible[32] = { 0 }; - packet_read(p, incompatible, incompatibleLength * sizeof(u8)); - mod->incompatible = strdup(incompatible); + if (incompatibleLength > 0) { + char incompatible[32] = { 0 }; + packet_read(p, incompatible, incompatibleLength * sizeof(u8)); + mod->incompatible = strdup(incompatible); + } else { + packet_read(p, 0, 0); + } // get other fields u16 relativePathLength = 0;