mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-30 07:34:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

String safety (#1548)

Browse Source 
* Array size UB fixes

* Fix ShieldD

* Remove (almost) all unsafe strcpy calls

Bunch of macros. C arrays are easy enough and just need a different call. For various cases where a char* is passed around bare, I've made a TEXT_SPAN macro that can store a length too for bounds checking.

* Move crash handling in safe string operations to separate TU

* strcat safe version

* sprintf made safe too

* Fix compile
This commit is contained in:
Pieter-Jan Briers
2026-05-24 18:43:00 +02:00
committed by GitHub
parent af162bbd0a
commit a6376368ee
100 changed files with 781 additions and 546 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/d_msg_string_base.cpp
+3 -3
View File
@@ -126,7 +126,7 @@ u8 dMsgStringBase_c::getPageMax(int param_0) {
return pageMax;
}
f32 dMsgStringBase_c::getMessageLocal(u32 param_1, char* param_2) {
f32 dMsgStringBase_c::getMessageLocal(u32 param_1, TEXT_SPAN param_2) {
if (dMeter2Info_getMsgResource() != NULL) {
if (param_1 > 5000) {
if (field_0x1c != dMeter2Info_getStageMsgResource()) {
@@ -146,7 +146,7 @@ f32 dMsgStringBase_c::getMessageLocal(u32 param_1, char* param_2) {
mpCtrl->render();
mpCtrl->reset();
mpCtrl->resetResourceCache();
strcpy(param_2, mpRenProc->getString());
SAFE_STRCPY(param_2, mpRenProc->getString());
return 0.0f;
}
@@ -165,7 +165,7 @@ f32 dMsgStringBase_c::getStringPage(u32 param_0, u8 param_1, u8 param_2, J2DText
return getStringPageLocal(param_0, param_1, param_2, param_3, param_4, param_5, param_6, param_7);
}
f32 dMsgStringBase_c::getMessage(u32 param_0, char* param_1) {
f32 dMsgStringBase_c::getMessage(u32 param_0, TEXT_SPAN param_1) {
return getMessageLocal(param_0, param_1);
}