mika/switch-tools
1
0
Fork 0
mirror of https://github.com/switchbrew/switch-tools.git synced 2025-07-03 10:32:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix errors in elf2kip

Browse Source
This commit is contained in:
Michael Scire 2018-05-01 00:30:58 -06:00
parent 92268de97b
commit 648a5037e8
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/elf2kip.c
View File

@ -460,7 +460,7 @@ int main(int argc, char* argv[]) {
KipHeader kip_hdr = {0}; KipHeader kip_hdr = {0};
memcpy(kip_hdr.Magic, "KIP1", 4); memcpy(kip_hdr.Magic, "KIP1", 4);
kip_hdr.Flags = 0x1F; kip_hdr.Flags = 0x3F;
if (sizeof(KipHeader) != 0x100) { if (sizeof(KipHeader) != 0x100) {
fprintf(stderr, "Bad compile environment!\n"); fprintf(stderr, "Bad compile environment!\n");
@ -538,13 +538,12 @@ int main(int argc, char* argv[]) {
} else { } else {
kip_hdr.Segments[i].DecompSz = 0; kip_hdr.Segments[i].DecompSz = 0;
} }
kip_hdr.Segments[i].DstOff = phdr->p_vaddr;
kip_hdr.Segments[i].CompSz = 0; kip_hdr.Segments[i].CompSz = 0;
break; break;
} }
FileOffsets[i] = phdr->p_vaddr; FileOffsets[i] = file_off;
kip_hdr.Segments[i].DecompSz = (phdr->p_filesz + 0xFFF) & ~0xFFF; kip_hdr.Segments[i].DecompSz = phdr->p_filesz;
buf[i] = malloc(kip_hdr.Segments[i].DecompSz); buf[i] = malloc(kip_hdr.Segments[i].DecompSz);
if (buf[i] == NULL) { if (buf[i] == NULL) {
@ -556,7 +555,7 @@ int main(int argc, char* argv[]) {
memcpy(buf[i], &elf[phdr->p_offset], phdr->p_filesz); memcpy(buf[i], &elf[phdr->p_offset], phdr->p_filesz);
cmp[i] = BLZ_Code(buf[i], phdr->p_filesz, &kip_hdr.Segments[i].CompSz, BLZ_BEST); cmp[i] = BLZ_Code(buf[i], phdr->p_filesz, &kip_hdr.Segments[i].CompSz, BLZ_BEST);
file_off += kip_hdr.Segments[i].CompSz; file_off += kip_hdr.Segments[i].CompSz;
dst_off += kip_hdr.Segments[i].DecompSz; dst_off += kip_hdr.Segments[i].DecompSz;
dst_off = (dst_off + 0xFFF) & ~0xFFF; dst_off = (dst_off + 0xFFF) & ~0xFFF;
@ -573,7 +572,7 @@ int main(int argc, char* argv[]) {
for (i=0; i<3; i++) for (i=0; i<3; i++)
{ {
fseek(out, sizeof(kip_hdr) + kip_hdr.Segments[i].DstOff, SEEK_SET); fseek(out, sizeof(kip_hdr) + FileOffsets[i], SEEK_SET);
fwrite(cmp[i], kip_hdr.Segments[i].CompSz, 1, out); fwrite(cmp[i], kip_hdr.Segments[i].CompSz, 1, out);
} }