picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

efivars: use greedy_realloc

Browse source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2015-03-09 16:09:16 -04:00
parent 0797f2329c
commit 7432b24b83
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/shared/efivars.c
View file

@ -504,6 +504,7 @@ int efi_get_boot_options(uint16_t **options) {
_cleanup_closedir_ DIR *dir = NULL;
struct dirent *de;
_cleanup_free_ uint16_t *list = NULL;
size_t alloc = 0;
int count = 0;
assert(options);
@ -514,7 +515,6 @@ int efi_get_boot_options(uint16_t **options) {
FOREACH_DIRENT(de, dir, return -errno) {
int id;
uint16_t *t;
if (strncmp(de->d_name, "Boot", 4) != 0)
continue;
@ -529,12 +529,10 @@ int efi_get_boot_options(uint16_t **options) {
if (id < 0)
continue;
t = realloc(list, (count + 1) * sizeof(uint16_t));
if (!t)
if (!GREEDY_REALLOC(list, alloc, count + 1))
return -ENOMEM;
list = t;
list[count ++] = id;
list[count++] = id;
}
qsort_safe(list, count, sizeof(uint16_t), cmp_uint16);