joel16/VitaShell
1
0
Fork 0
mirror of https://github.com/joel16/VitaShell.git synced 2024-11-23 19:59:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #190 from d3m3vilurr/fix-crash-at-install

Browse Source 
Fix crash at the vpk install
This commit is contained in:
TheOfficialFloW 2017-01-13 16:53:46 +01:00 committed by GitHub
commit 05e7a736e3
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
archive.c
View File

@ -71,22 +71,28 @@ int archiveCheckFilesForUnsafeFself() {
int size = archiveFileRead(ARCHIVE_FD, buffer, archive_entry->size);
Elf32_Ehdr *elf1 = (Elf32_Ehdr*)buffer;
Elf32_Phdr *phdr = (Elf32_Phdr*)buffer + phdr_offset - elf1_offset;
Elf32_Phdr *phdr = (Elf32_Phdr*)(buffer + phdr_offset - elf1_offset);
segment_info *info = (segment_info*)(buffer + section_info_offset - elf1_offset);
char *segment = buffer + info->offset;
// segment is elf2 section
char *segment = buffer + info->offset - elf1_offset;
// zlib compress magic
char *uncompressed_buffer = NULL;
if (segment[0] == 0x78) {
char *uncompressed_buffer = uncompressBuffer(elf1, phdr, info, segment);
// uncompressedBuffer will return elf2 section
uncompressed_buffer = uncompressBuffer(elf1, phdr, info, segment);
if (uncompressed_buffer) {
free(buffer);
buffer = uncompressed_buffer;
segment = uncompressed_buffer;
}
}
int unsafe = checkForUnsafeImports(segment);
int unsafe = checkForUnsafeImports(buffer);
if (uncompressed_buffer) {
free(uncompressed_buffer);
}
free(buffer);
if (unsafe) {
archiveFileClose(ARCHIVE_FD);
return unsafe;