The-Homebrew-Cloud/skyline
2
0
Fork 0
mirror of https://github.com/skyline-emu/skyline.git synced 2024-11-26 15:54:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Avoid aligning BSS and .data individually and instead align as one

Browse Source 
As both of these are in the same memory segment they have no individual
alignment requirements, this created a bug in
にゃんらぶ～私の恋の見つけ方～ where the data segment would be larger
than the game expected and invalid command line arguments would be read.
This commit is contained in:
Billy Laws 2021-05-31 17:23:59 +01:00
parent e1ca24d35f
commit d57883705d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/cpp/skyline/loader/nso.cpp
View File

@ -46,10 +46,10 @@ namespace skyline::loader {
executable.ro.offset = header.ro.memoryOffset; executable.ro.offset = header.ro.memoryOffset;
executable.data.contents = GetSegment(backing, header.data, header.flags.dataCompressed ? header.dataCompressedSize : 0); executable.data.contents = GetSegment(backing, header.data, header.flags.dataCompressed ? header.dataCompressedSize : 0);
executable.data.contents.resize(util::AlignUp(executable.data.contents.size(), PAGE_SIZE));
executable.data.offset = header.data.memoryOffset; executable.data.offset = header.data.memoryOffset;
executable.bssSize = util::AlignUp(header.bssSize, PAGE_SIZE); // Data and BSS are aligned together
executable.bssSize = util::AlignUp(executable.data.contents.size() + header.bssSize, PAGE_SIZE) - executable.data.contents.size();
if (header.dynsym.offset + header.dynsym.size <= header.ro.decompressedSize && header.dynstr.offset + header.dynstr.size <= header.ro.decompressedSize) { if (header.dynsym.offset + header.dynsym.size <= header.ro.decompressedSize && header.dynstr.offset + header.dynstr.size <= header.ro.decompressedSize) {
executable.dynsym = {header.dynsym.offset, header.dynsym.size}; executable.dynsym = {header.dynsym.offset, header.dynsym.size};