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

elf2kip: Add support for 0x<hex> string syscall identifiers

Browse Source
This commit is contained in:
Michael Scire 2018-04-24 17:13:53 -06:00
parent 87fd7b2ea6
commit 97ab2514f0
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/elf2kip.c
View File

@ -287,13 +287,22 @@ int ParseKipConfiguration(const char *json, KipHeader *kip_hdr) {
u32 descriptors[6] = {0}; /* alignup(0x80/0x18); */ u32 descriptors[6] = {0}; /* alignup(0x80/0x18); */
char field_name[8] = {0}; char field_name[8] = {0};
const cJSON *cur_syscall = NULL; const cJSON *cur_syscall = NULL;
u64 syscall_value = 0;
cJSON_ArrayForEach(cur_syscall, value) { cJSON_ArrayForEach(cur_syscall, value) {
if (!cJSON_IsNumber(cur_syscall) || cur_syscall->valueint < 0 || cur_syscall->valueint >= 0x80) { if (cJSON_IsNumber(cur_syscall)) {
syscall_value = (u64)cur_syscall->valueint;
} else if (!cJSON_IsString(cur_syscall) || !cJSON_GetU64(value, cur_syscall->string, &syscall_value)) {
fprintf(stderr, "Error: Syscall entries must be integers or hex strings.\n");
status = 0;
goto PARSE_CAPS_END;
}
if (syscall_value >= 0x80) {
fprintf(stderr, "Error: All syscall entries must be numbers in [0, 0x7F]\n"); fprintf(stderr, "Error: All syscall entries must be numbers in [0, 0x7F]\n");
status = 0; status = 0;
goto PARSE_CAPS_END; goto PARSE_CAPS_END;
} }
descriptors[cur_syscall->valueint / 0x18] |= (1UL << (cur_syscall->valueint % 0x18)); descriptors[syscall_value / 0x18] |= (1UL << (syscall_value % 0x18));
} }
for (unsigned int i = 0; i < 6; i++) { for (unsigned int i = 0; i < 6; i++) {
if (descriptors[i]) { if (descriptors[i]) {