DocRock3r/custom-install
1
0
Fork 0
mirror of https://github.com/ihaveamac/custom-install.git synced 2025-12-06 06:41:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

finalize: fix using pointers incorrectly, meaning only one title would work

Browse Source
This commit is contained in:
Ian Burgwin
2020-05-23 11:02:25 -07:00
parent 167a80ff11
commit a515ca7e61
1 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
finalize/source/main.c
View File

@@ -85,6 +85,8 @@ int load_cifinish(char* path, struct finish_db_entry_final **entries)
struct finish_db_entry_v2 v2; struct finish_db_entry_v2 v2;
struct finish_db_entry_v3 v3; struct finish_db_entry_v3 v3;
struct finish_db_entry_final *tmp;
int i; int i;
size_t read; size_t read;
@@ -114,6 +116,12 @@ int load_cifinish(char* path, struct finish_db_entry_final **entries)
} }
*entries = calloc(header.title_count, sizeof(struct finish_db_entry_final)); *entries = calloc(header.title_count, sizeof(struct finish_db_entry_final));
if (!*entries) {
printf("Couldn't allocate memory.\n");
printf("This should never happen.\n");
goto fail;
}
tmp = *entries;
if (header.version == 1) if (header.version == 1)
{ {
@@ -133,9 +141,9 @@ int load_cifinish(char* path, struct finish_db_entry_final **entries)
printf(" Is the file corrupt?\n"); printf(" Is the file corrupt?\n");
goto fail; goto fail;
} }
entries[i]->has_seed = v1.has_seed; tmp[i].has_seed = v1.has_seed;
entries[i]->title_id = v1.title_id; tmp[i].title_id = v1.title_id;
memcpy(entries[i]->seed, v1.seed, 16); memcpy(tmp[i].seed, v1.seed, 16);
} }
} else if (header.version == 2) { } else if (header.version == 2) {
for (i = 0; i < header.title_count; i++) for (i = 0; i < header.title_count; i++)
@@ -154,9 +162,9 @@ int load_cifinish(char* path, struct finish_db_entry_final **entries)
printf(" Is the file corrupt?\n"); printf(" Is the file corrupt?\n");
goto fail; goto fail;
} }
entries[i]->has_seed = v2.has_seed; tmp[i].has_seed = v2.has_seed;
entries[i]->title_id = v2.title_id; tmp[i].title_id = v2.title_id;
memcpy(entries[i]->seed, v2.seed, 16); memcpy(tmp[i].seed, v2.seed, 16);
} }
} else if (header.version == 3) { } else if (header.version == 3) {
for (i = 0; i < header.title_count; i++) for (i = 0; i < header.title_count; i++)
@@ -175,9 +183,9 @@ int load_cifinish(char* path, struct finish_db_entry_final **entries)
printf(" Is the file corrupt?\n"); printf(" Is the file corrupt?\n");
goto fail; goto fail;
} }
entries[i]->has_seed = v3.has_seed; tmp[i].has_seed = v3.has_seed;
entries[i]->title_id = v3.title_id; tmp[i].title_id = v3.title_id;
memcpy(entries[i]->seed, v3.seed, 16); memcpy(tmp[i].seed, v3.seed, 16);
} }
} }
@@ -267,7 +275,7 @@ int main(int argc, char* argv[])
gfxInitDefault(); gfxInitDefault();
consoleInit(GFX_TOP, NULL); consoleInit(GFX_TOP, NULL);
printf("custom-install-finalize v1.3\n"); printf("custom-install-finalize v1.4\n");
finalize_install(); finalize_install();
// print this at the end in case it gets pushed off the screen // print this at the end in case it gets pushed off the screen