chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sleep-config: fix double free
[elogind.git]
/
src
/
shared
/
efivars.c
diff --git
a/src/shared/efivars.c
b/src/shared/efivars.c
index f3eb6a6e5d1ca321555820a4141f2a0b7291f377..000dae9de0fd0f389823d7339ea638b8165c45f6 100644
(file)
--- a/
src/shared/efivars.c
+++ b/
src/shared/efivars.c
@@
-37,7
+37,7
@@
bool is_efi_boot(void) {
static int read_flag(const char *varname) {
int r;
static int read_flag(const char *varname) {
int r;
-
void *v
;
+
_cleanup_free_ void *v = NULL
;
size_t s;
uint8_t b;
size_t s;
uint8_t b;
@@
-45,15
+45,11
@@
static int read_flag(const char *varname) {
if (r < 0)
return r;
if (r < 0)
return r;
- if (s != 1) {
- r = -EINVAL;
- goto finish;
- }
+ if (s != 1)
+ return -EINVAL;
b = *(uint8_t *)v;
r = b > 0;
b = *(uint8_t *)v;
r = b > 0;
-finish:
- free(v);
return r;
}
return r;
}