Merge branch 'master' into theUltimateFix

This commit is contained in:
tildearrow 2024-10-30 14:57:09 -05:00
commit 92a615eefc
35 changed files with 48 additions and 16 deletions

View file

@ -108,9 +108,8 @@ void DivEngine::loadPZI(SafeReader& reader, std::vector<DivSample*>& ret, String
for(int i = 0; i < PZI_BANK_SIZE; i++)
{
if (headers[i].start_pointer < MAX_SANITY_CAP && headers[i].sample_length < MAX_SANITY_CAP &&
headers[i].loop_start < MAX_SANITY_CAP && headers[i].loop_end < MAX_SANITY_CAP &&
headers[i].start_pointer > 0 && headers[i].sample_length > 0)
if (headers[i].start_pointer < MAX_SANITY_CAP && headers[i].sample_length < MAX_SANITY_CAP &&
headers[i].sample_length > 0)
{
DivSample* s = new DivSample;
@ -152,4 +151,4 @@ void DivEngine::loadPZI(SafeReader& reader, std::vector<DivSample*>& ret, String
lastError=_("premature end of file");
logE("premature end of file");
}
}
}

View file

@ -92,7 +92,6 @@ const char* aboutLine[]={
"AmigaX",
"AquaDoesStuff",
"AstralBlue",
"AURORA*FIELDS",
"Background2982",
"battybeats",
"bbqzzd",
@ -143,10 +142,8 @@ const char* aboutLine[]={
"LovelyA72",
"LTVA",
"LunaMoth",
"Lunathir",
"LVintageNerd",
"Mahbod Karamoozian",
"Martin Demsky",
"masicbemester",
"MelonadeM",
"Miker",