From e601d5d1c5770db4bde7ca8d5b5dd2d7b6cdfa8e Mon Sep 17 00:00:00 2001 From: Brian Lyman <30790982+brianlyman@users.noreply.github.com> Date: Wed, 11 Nov 2026 01:37:49 -0600 Subject: [PATCH] [Patches] Fix guild tribute name copy aborting zones under _FORTIFY_SOURCE (#5143) Co-authored-by: Claude Opus 5.5 --- common/patches/titanium.cpp | 2 +- common/patches/uf.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/patches/titanium.cpp b/common/patches/titanium.cpp index 395094306..eb7388186 100644 --- a/common/patches/titanium.cpp +++ b/common/patches/titanium.cpp @@ -1022,7 +1022,7 @@ namespace Titanium ALLOC_VAR_ENCODE(structs::GuildTributeAbility_Struct, sizeof(GuildTributeAbility_Struct) + strlen(emu->ability.name)); eq->guild_id = emu->guild_id;; - strncpy(eq->ability.name, emu->ability.name, strlen(emu->ability.name)); + memcpy(eq->ability.name, emu->ability.name, strlen(emu->ability.name)); eq->ability.tribute_id = emu->ability.tribute_id; eq->ability.tier_count = emu->ability.tier_count; for (int i = 0; i < ntohl(emu->ability.tier_count); i++) { diff --git a/common/patches/uf.cpp b/common/patches/uf.cpp index 32f958b35..445b446df 100644 --- a/common/patches/uf.cpp +++ b/common/patches/uf.cpp @@ -1378,7 +1378,7 @@ namespace UF eq->guild_id = emu->guild_id; eq->ability.tribute_id = emu->ability.tribute_id; eq->ability.tier_count = emu->ability.tier_count; - strncpy(eq->ability.name, emu->ability.name, strlen(emu->ability.name)); + memcpy(eq->ability.name, emu->ability.name, strlen(emu->ability.name)); for (int i = 0; i < ntohl(emu->ability.tier_count); i++) { eq->ability.tiers[i].cost = emu->ability.tiers[i].cost; eq->ability.tiers[i].level = emu->ability.tiers[i].level;