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

efivars: use more _cleanup_

Browse source 
Also rename r to buf, since r is customarily reserved for the return value.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2015-03-09 16:04:42 -04:00
parent 0aa3b7830f
commit 0797f2329c
1 changed files with 15 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/shared/efivars.c
View file

@ -105,7 +105,7 @@ int efi_get_variable(
uint32_t a;
ssize_t n;
struct stat st;
void *r;
_cleanup_free_ void *buf;
assert(name);
assert(value);
@ -133,25 +133,22 @@ int efi_get_variable(
if (n != sizeof(a))
return -EIO;
r = malloc(st.st_size - 4 + 2);
if (!r)
buf = malloc(st.st_size - 4 + 2);
if (!buf)
return -ENOMEM;
n = read(fd, r, (size_t) st.st_size - 4);
if (n < 0) {
free(r);
n = read(fd, buf, (size_t) st.st_size - 4);
if (n < 0)
return -errno;
}
if (n != (ssize_t) st.st_size - 4) {
free(r);
if (n != (ssize_t) st.st_size - 4)
return -EIO;
}
/* Always NUL terminate (2 bytes, to protect UTF-16) */
((char*) r)[st.st_size - 4] = 0;
((char*) r)[st.st_size - 4 + 1] = 0;
((char*) buf)[st.st_size - 4] = 0;
((char*) buf)[st.st_size - 4 + 1] = 0;
*value = r;
*value = buf;
buf = NULL;
*size = (size_t) st.st_size - 4;
if (attribute)
@ -458,7 +455,7 @@ int efi_remove_boot_option(uint16_t id) {
}
int efi_get_boot_order(uint16_t **order) {
void *buf;
_cleanup_free_ void *buf = NULL;
size_t l;
int r;
@ -466,18 +463,15 @@ int efi_get_boot_order(uint16_t **order) {
if (r < 0)
return r;
if (l <= 0) {
free(buf);
if (l <= 0)
return -ENOENT;
}
if ((l % sizeof(uint16_t) > 0) ||
(l / sizeof(uint16_t) > INT_MAX)) {
free(buf);
if (l % sizeof(uint16_t) > 0 ||
l / sizeof(uint16_t) > INT_MAX)
return -EINVAL;
}
*order = buf;
buf = NULL;
return (int) (l / sizeof(uint16_t));
}