proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-09 20:55:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2267 from brauner/QbitLogic-master

Browse Source 
Mergeable branch for C0deAi fixes
This commit is contained in:
Christian Brauner 2018-04-09 21:00:36 +02:00 committed by GitHub
commit e456a1ef55
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/lxc/cmd/lxc_init.c
View File

@ -100,7 +100,6 @@ static struct arguments my_args = {
static void prevent_forking(void) static void prevent_forking(void)
{ {
FILE *f; FILE *f;
int fd = -1;
size_t len = 0; size_t len = 0;
char *line = NULL; char *line = NULL;
char path[MAXPATHLEN]; char path[MAXPATHLEN];
@ -110,7 +109,7 @@ static void prevent_forking(void)
return; return;
while (getline(&line, &len, f) != -1) { while (getline(&line, &len, f) != -1) {
int ret; int fd, ret;
char *p, *p2; char *p, *p2;
p = strchr(line, ':'); p = strchr(line, ':');
@ -146,11 +145,11 @@ static void prevent_forking(void)
goto on_error; goto on_error;
} }
if (write(fd, "1", 1) != 1) ret = write(fd, "1", 1);
if (ret != 1)
SYSERROR("Failed to write to \"%s\"", path); SYSERROR("Failed to write to \"%s\"", path);
close(fd); close(fd);
fd = -1;
break; break;
} }

4
src/lxc/storage/rsync.c
View File

@ -73,8 +73,10 @@ int lxc_rsync_exec(const char *src, const char *dest)
return -1; return -1;
ret = snprintf(s, l, "%s", src); ret = snprintf(s, l, "%s", src);
if (ret < 0 || (size_t)ret >= l) if (ret < 0 || (size_t)ret >= l) {
free(s);
return -1; return -1;
}
s[l - 2] = '/'; s[l - 2] = '/';
s[l - 1] = '\0'; s[l - 1] = '\0';

5
src/lxc/tools/tool_utils.c
View File

@ -794,8 +794,11 @@ int lxc_config_define_add(struct lxc_list *defines, char *arg)
return -1; return -1;
dent->elem = parse_line(arg); dent->elem = parse_line(arg);
if (!dent->elem) if (!dent->elem) {
free(dent);
return -1; return -1;
}
lxc_list_add_tail(defines, dent); lxc_list_add_tail(defines, dent);
return 0; return 0;
} }