mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-07-05 03:29:45 -04:00
String safety (#1548)
* 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:
committed by
GitHub
parent
af162bbd0a
commit
a6376368ee
@@ -186,8 +186,8 @@ int dMeterString_c::_delete() {
|
||||
int dMeterString_c::createString(int i_stringID) {
|
||||
char str_buf[32];
|
||||
dMeter2Info_getString(i_stringID, str_buf, NULL);
|
||||
strcpy(static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('get_in_s')))->getStringPtr(), str_buf);
|
||||
strcpy(static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('get_in')))->getStringPtr(), str_buf);
|
||||
SAFE_STRCPY(static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('get_in_s')))->getStringPtr(), str_buf);
|
||||
SAFE_STRCPY(static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('get_in')))->getStringPtr(), str_buf);
|
||||
|
||||
mAnimFrame = 40.0f;
|
||||
mPikariAnimFrame = -1.0f;
|
||||
|
||||
Reference in New Issue
Block a user