mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-17 12:39:27 -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_menu_letter.cpp
+6 -6
View File
@@ -501,10 +501,10 @@ void dMenu_Letter_c::read_open_init() {
field_0x3e2 = mpString->getPageMax(D_MENU_LETTER_LINE_MAX);
if (field_0x3e2 > 1) {
char acStack_30[20];
sprintf(acStack_30, "%d/%d", field_0x3e3, field_0x3e2);
SAFE_SPRINTF(acStack_30, "%d/%d", field_0x3e3, field_0x3e2);
for (int i = 0; i < 2; i++) {
field_0x1e4[i]->show();
strcpy(field_0x1e4[i]->getStringPtr(), acStack_30);
SAFE_STRCPY(field_0x1e4[i]->getStringPtr(), acStack_30);
}
} else {
for (int i = 0; i < 2; i++) {
@@ -654,10 +654,10 @@ void dMenu_Letter_c::read_next_fadein_init() {
D_MENU_LETTER_LINE_MAX, text2, text1, NULL, NULL, 0);
}
char acStack_30[10];
sprintf(acStack_30, "%d/%d", field_0x3e3, field_0x3e2);
SAFE_SPRINTF(acStack_30, "%d/%d", field_0x3e3, field_0x3e2);
for (int i = 0; i < 2; i++) {
field_0x1e4[i]->show();
strcpy(field_0x1e4[i]->getStringPtr(), acStack_30);
SAFE_STRCPY(field_0x1e4[i]->getStringPtr(), acStack_30);
}
}
@@ -1273,7 +1273,7 @@ void dMenu_Letter_c::copyDMYMenu() {
void dMenu_Letter_c::setAButtonString(u16 i_stringID) {
if (i_stringID == 0) {
for (int i = 0; i < 5; i++) {
strcpy(mpAButtonString[i]->getStringPtr(), "");
SAFE_STRCPY(mpAButtonString[i]->getStringPtr(), "");
}
} else {
for (int i = 0; i < 5; i++) {
@@ -1286,7 +1286,7 @@ void dMenu_Letter_c::setAButtonString(u16 i_stringID) {
void dMenu_Letter_c::setBButtonString(u16 i_stringID) {
if (i_stringID == 0) {
for (int i = 0; i < 5; i++) {
strcpy(mpBButtonString[i]->getStringPtr(), "");
SAFE_STRCPY(mpBButtonString[i]->getStringPtr(), "");
}
} else {
for (int i = 0; i < 5; i++) {