mika/libnx
1
0
Fork 0
mirror of https://github.com/switchbrew/libnx.git synced 2025-06-29 16:22:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug where attempts to parse __argdata__ while running as an NRO

Browse Source
This commit is contained in:
plutoo 2018-02-04 03:29:21 +01:00
parent 2103e40448
commit 356a06fb94
1 changed files with 65 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

127
nx/source/runtime/argv.c
View File

@ -1,6 +1,7 @@
#include <string.h> #include <string.h>
#include <ctype.h> #include <ctype.h>
#include "result.h" #include "result.h"
#include "runtime/env.h"
#include "kernel/svc.h" #include "kernel/svc.h"
// System globals we define here // System globals we define here
@ -35,86 +36,88 @@ void argvSetup(void)
__system_argc = 0; __system_argc = 0;
__system_argv = NULL; __system_argv = NULL;
memset(&meminfo, 0, sizeof(meminfo)); // TODO: Use envHasArgv() here for the NRO case.
rc = svcQueryMemory(&meminfo, &pageinfo, (u64)argdata);
// TODO: Use envHasArgv() here. if (envIsNso()) {
memset(&meminfo, 0, sizeof(meminfo));
rc = svcQueryMemory(&meminfo, &pageinfo, (u64)argdata);
// This memory is only mapped when arguments were passed. // This memory is only mapped when arguments were passed.
if (R_FAILED(rc) || meminfo.perm != 0x3) if (R_FAILED(rc) || meminfo.perm != 0x3)
return; return;
argdata_allocsize = (u64)arg32[0]; argdata_allocsize = (u64)arg32[0];
argdata_strsize = (u64)arg32[1]; argdata_strsize = (u64)arg32[1];
args = (char*)&argdata[0x20]; args = (char*)&argdata[0x20];
if (argdata_allocsize==0 || argdata_strsize==0) return; if (argdata_allocsize==0 || argdata_strsize==0) return;
if ((u64)argdata < meminfo.addr) return; if ((u64)argdata < meminfo.addr) return;
if (((u64)argdata - meminfo.addr) + argdata_allocsize > meminfo.size) return; if (((u64)argdata - meminfo.addr) + argdata_allocsize > meminfo.size) return;
argvptr_pos = 0x20 + argdata_strsize+1; argvptr_pos = 0x20 + argdata_strsize+1;
if (argvptr_pos >= argdata_allocsize) return; if (argvptr_pos >= argdata_allocsize) return;
argstorage = (char*)&argdata[argvptr_pos]; argstorage = (char*)&argdata[argvptr_pos];
argvptr_pos += (argdata_strsize+1 + 0x9) & ~0x7; argvptr_pos += (argdata_strsize+1 + 0x9) & ~0x7;
if (argvptr_pos >= argdata_allocsize) return; if (argvptr_pos >= argdata_allocsize) return;
max_argv = (argdata_allocsize - argvptr_pos) >> 3; max_argv = (argdata_allocsize - argvptr_pos) >> 3;
if (max_argv < 2) return; if (max_argv < 2) return;
__system_argv = (char**)&argdata[argvptr_pos]; __system_argv = (char**)&argdata[argvptr_pos];
argstart = NULL; argstart = NULL;
for(argi=0; argi<argdata_strsize; argi++) { for(argi=0; argi<argdata_strsize; argi++) {
if (argstart == NULL && isspace(args[argi])) continue; if (argstart == NULL && isspace(args[argi])) continue;
if (argstart == NULL) { if (argstart == NULL) {
if (args[argi] == '"') { if (args[argi] == '"') {
argstart = &args[argi+1]; argstart = &args[argi+1];
quote_flag = 1; quote_flag = 1;
}
else if(args[argi]!=0) {
argstart = &args[argi];
arglen++;
}
} }
else if(args[argi]!=0) { else {
argstart = &args[argi]; end_flag = 0;
arglen++;
if (quote_flag && args[argi] == '"') {
end_flag = 1;
}
else if (isspace(args[argi])) {
end_flag = 1;
}
else if(args[argi]!=0) {
arglen++;
}
if ((args[argi]==0 || end_flag) && arglen) {
strncpy(argstorage, argstart, arglen);
argstorage[arglen] = 0;
__system_argv[__system_argc] = argstorage;
__system_argc++;
argstart = NULL;
quote_flag = 0;
argstorage+= arglen+1;
arglen = 0;
if (__system_argc >= max_argv) break;
}
} }
} }
else {
end_flag = 0;
if (quote_flag && args[argi] == '"') { if (arglen && __system_argc < max_argv) {
end_flag = 1; strncpy(argstorage, argstart, arglen);
} argstorage[arglen] = 0;
else if (isspace(args[argi])) { __system_argv[__system_argc] = argstorage;
end_flag = 1; __system_argc++;
}
else if(args[argi]!=0) {
arglen++;
}
if ((args[argi]==0 || end_flag) && arglen) {
strncpy(argstorage, argstart, arglen);
argstorage[arglen] = 0;
__system_argv[__system_argc] = argstorage;
__system_argc++;
argstart = NULL;
quote_flag = 0;
argstorage+= arglen+1;
arglen = 0;
if (__system_argc >= max_argv) break;
}
} }
}
if (arglen && __system_argc < max_argv) { __system_argv[__system_argc] = NULL;
strncpy(argstorage, argstart, arglen);
argstorage[arglen] = 0;
__system_argv[__system_argc] = argstorage;
__system_argc++;
} }
__system_argv[__system_argc] = NULL;
} }