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

Make sure to cleanup and exit with an error if malloc fails in append_alloted

Browse Source 
Signed-off-by: Henrik Kjölhede <hkjolhede@gmail.com>
This commit is contained in:
Henrik Kjölhede 2015-06-21 11:13:01 +02:00
parent 21002b3950
commit 680836fa52
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/lxc/lxc_user_nic.c
View File

@ -194,6 +194,7 @@ static struct alloted_s *append_alloted(struct alloted_s **head, char *name, int
if (head == NULL || name == NULL) { if (head == NULL || name == NULL) {
// sanity check. parameters should not be null // sanity check. parameters should not be null
fprintf(stderr, "NULL parameters to append_alloted not allowed\n");
return NULL; return NULL;
} }
@ -201,6 +202,7 @@ static struct alloted_s *append_alloted(struct alloted_s **head, char *name, int
if (al == NULL) { if (al == NULL) {
// unable to allocate memory to new struct // unable to allocate memory to new struct
fprintf(stderr, "Out of memory in append_alloted\n");
return NULL; return NULL;
} }
@ -294,8 +296,14 @@ static int get_alloted(char *me, char *intype, char *link, struct alloted_s **al
/* found the user or group with the appropriate settings, therefore finish the search. /* found the user or group with the appropriate settings, therefore finish the search.
* what to do if there are more than one applicable lines? not specified in the docs. * what to do if there are more than one applicable lines? not specified in the docs.
* since getline is implemented with realloc, we don't need to free line until exiting func. * since getline is implemented with realloc, we don't need to free line until exiting func.
*
* if append_alloted returns NULL, e.g. due to a malloc error, we set count to 0 and break the loop,
* allowing cleanup and then exiting from main()
*/ */
append_alloted(alloted, name, n); if (append_alloted(alloted, name, n) == NULL) {
count = 0;
break;
}
count += n; count += n;
} }