gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2026-08-20 22:04:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix OOM for too-small overlay files in 32K mode (rgblink -t)

Browse Source
This commit is contained in:
Rangi
2026-07-13 16:17:30 -04:00
parent 66312f55dd
commit 417b5212d4
7 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/link/output.cpp
+7 -4
View File
@@ -126,7 +126,8 @@ static uint32_t checkOverlaySize() {
warnx("Overlay file does not have a size multiple of 0x4000");
} else if (options.is32kMode && overlaySize != 0x8000) {
warnx("Overlay is not exactly 0x8000 bytes large");
} else if (overlaySize < 0x8000) {
}
if (overlaySize < 0x8000) {
warnx("Overlay is less than 0x8000 bytes large");
}
@@ -140,9 +141,11 @@ static void coverOverlayBanks(uint32_t nbOverlayBanks) {
// 2 if options.is32kMode, 1 otherwise
uint32_t nbRom0Banks = sectionTypeInfo[SECTTYPE_ROM0].size / BANK_SIZE;
// Discount ROM0 banks to avoid outputting too much
uint32_t nbUncoveredBanks = nbOverlayBanks - nbRom0Banks > sections[SECTTYPE_ROMX].size()
? nbOverlayBanks - nbRom0Banks
: 0;
uint32_t nbUncoveredBanks =
nbOverlayBanks >= nbRom0Banks
&& nbOverlayBanks - nbRom0Banks > sections[SECTTYPE_ROMX].size()
? nbOverlayBanks - nbRom0Banks
: 0;
if (nbUncoveredBanks > sections[SECTTYPE_ROMX].size()) {
for (uint32_t i = sections[SECTTYPE_ROMX].size(); i < nbUncoveredBanks; ++i) {