nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-14 07:03:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

make check-spaces fix

Browse Source
This commit is contained in:
Cristian Toader 2013-08-29 16:53:12 +03:00
parent 1118bd9910
commit 3e803a1f18
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/common/sandbox.c
View File

@ -679,14 +679,15 @@ sandbox_intern_string(const char *param)
} }
static int static int
prot_strings(sandbox_cfg_t* cfg) { prot_strings(sandbox_cfg_t* cfg)
{
int ret = 0; int ret = 0;
int pr_mem_size = 0, pr_mem_left = 0; int pr_mem_size = 0, pr_mem_left = 0;
char *pr_mem_next = NULL, *pr_mem_base; char *pr_mem_next = NULL, *pr_mem_base;
sandbox_cfg_t *el = NULL; sandbox_cfg_t *el = NULL;
// get total number of bytes required to mmap // get total number of bytes required to mmap
for(el = cfg; el != NULL; el = el->next) { for (el = cfg; el != NULL; el = el->next) {
pr_mem_size += strlen((char*) el->param) + 1; pr_mem_size += strlen((char*) el->param) + 1;
} }
@ -768,7 +769,7 @@ sandbox_cfg_allow_stat64_filename_array(sandbox_cfg_t **cfg, ...)
va_list ap; va_list ap;
va_start(ap, cfg); va_start(ap, cfg);
while((fn = va_arg(ap, char*)) != NULL) { while ((fn = va_arg(ap, char*)) != NULL) {
int fr = va_arg(ap, int); int fr = va_arg(ap, int);
rc = sandbox_cfg_allow_stat64_filename(cfg, fn, fr); rc = sandbox_cfg_allow_stat64_filename(cfg, fn, fr);
@ -812,7 +813,7 @@ sandbox_cfg_allow_open_filename_array(sandbox_cfg_t **cfg, ...)
va_list ap; va_list ap;
va_start(ap, cfg); va_start(ap, cfg);
while((fn = va_arg(ap, char*)) != NULL) { while ((fn = va_arg(ap, char*)) != NULL) {
int fr = va_arg(ap, int); int fr = va_arg(ap, int);
rc = sandbox_cfg_allow_open_filename(cfg, fn, fr); rc = sandbox_cfg_allow_open_filename(cfg, fn, fr);
@ -855,7 +856,7 @@ sandbox_cfg_allow_openat_filename_array(sandbox_cfg_t **cfg, ...)
va_list ap; va_list ap;
va_start(ap, cfg); va_start(ap, cfg);
while((fn = va_arg(ap, char*)) != NULL) { while ((fn = va_arg(ap, char*)) != NULL) {
int fr = va_arg(ap, int); int fr = va_arg(ap, int);
rc = sandbox_cfg_allow_openat_filename(cfg, fn, fr); rc = sandbox_cfg_allow_openat_filename(cfg, fn, fr);
@ -896,7 +897,7 @@ sandbox_cfg_allow_execve_array(sandbox_cfg_t **cfg, ...)
va_list ap; va_list ap;
va_start(ap, cfg); va_start(ap, cfg);
while((fn = va_arg(ap, char*)) != NULL) { while ((fn = va_arg(ap, char*)) != NULL) {
rc = sandbox_cfg_allow_execve(cfg, fn); rc = sandbox_cfg_allow_execve(cfg, fn);
if (rc) { if (rc) {