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

Fix errors in elf2kip (#8)

Browse Source
This commit is contained in:
SciresM 2018-05-01 10:13:41 -07:00 committed by fincs
parent 92268de97b
commit 227306d95a
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/blz.c
View File

@ -286,7 +286,7 @@ u8 *BLZ_Code(u8 *raw_buffer, int raw_len, u32 *new_len, int best) {
*(u32 *)pak = 0; pak += 4; *(u32 *)pak = 0; pak += 4;
} else { } else {
tmp = (u8 *) Memory(raw_tmp + pak_tmp + 11, sizeof(char)); tmp = (u8 *) Memory(raw_tmp + pak_tmp + 15, sizeof(char));
for (len = 0; len < raw_tmp; len++) for (len = 0; len < raw_tmp; len++)
tmp[len] = raw_buffer[len]; tmp[len] = raw_buffer[len];

9
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) {
@ -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);
} }