|
 |
a52f674 |
From 57856f3da469a06b5ef863c0d14a36b2b3befd87 Mon Sep 17 00:00:00 2001
|
|
|
b12ff75 |
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
|
|
b12ff75 |
Date: Sun, 15 Dec 2013 16:25:04 -0500
|
|
|
b12ff75 |
Subject: [PATCH] Fix a few resource leaks in error paths
|
|
|
b12ff75 |
|
|
|
b12ff75 |
https://bugzilla.redhat.com/show_bug.cgi?id=1043304
|
|
|
a52f674 |
(cherry picked from commit 2fd069b18e525860514a70d3ea08410ca122d3e2)
|
|
|
b12ff75 |
|
|
|
b12ff75 |
Conflicts:
|
|
|
b12ff75 |
src/libsystemd-bus/bus-objects.c
|
|
|
b12ff75 |
src/udev/net/link-config.c
|
|
|
b12ff75 |
---
|
|
|
b12ff75 |
src/sleep/sleep.c | 15 +++++++--------
|
|
|
b12ff75 |
1 file changed, 7 insertions(+), 8 deletions(-)
|
|
|
b12ff75 |
|
|
|
b12ff75 |
diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c
|
|
|
b12ff75 |
index a56ab89..f96987f 100644
|
|
|
b12ff75 |
--- a/src/sleep/sleep.c
|
|
|
b12ff75 |
+++ b/src/sleep/sleep.c
|
|
|
b12ff75 |
@@ -57,15 +57,14 @@ static int write_mode(char **modes) {
|
|
|
b12ff75 |
return r;
|
|
|
b12ff75 |
}
|
|
|
b12ff75 |
|
|
|
b12ff75 |
-static int write_state(FILE *f0, char **states) {
|
|
|
b12ff75 |
- FILE _cleanup_fclose_ *f = f0;
|
|
|
b12ff75 |
+static int write_state(FILE **f, char **states) {
|
|
|
b12ff75 |
char **state;
|
|
|
b12ff75 |
int r = 0;
|
|
|
b12ff75 |
|
|
|
b12ff75 |
STRV_FOREACH(state, states) {
|
|
|
b12ff75 |
int k;
|
|
|
b12ff75 |
|
|
|
b12ff75 |
- k = write_string_to_file(f, *state);
|
|
|
b12ff75 |
+ k = write_string_to_file(*f, *state);
|
|
|
b12ff75 |
if (k == 0)
|
|
|
b12ff75 |
return 0;
|
|
|
b12ff75 |
log_debug("Failed to write '%s' to /sys/power/state: %s",
|
|
|
b12ff75 |
@@ -73,9 +72,9 @@ static int write_state(FILE *f0, char **states) {
|
|
|
b12ff75 |
if (r == 0)
|
|
|
b12ff75 |
r = k;
|
|
|
b12ff75 |
|
|
|
b12ff75 |
- fclose(f);
|
|
|
b12ff75 |
- f = fopen("/sys/power/state", "we");
|
|
|
b12ff75 |
- if (!f) {
|
|
|
b12ff75 |
+ fclose(*f);
|
|
|
b12ff75 |
+ *f = fopen("/sys/power/state", "we");
|
|
|
b12ff75 |
+ if (!*f) {
|
|
|
b12ff75 |
log_error("Failed to open /sys/power/state: %m");
|
|
|
b12ff75 |
return -errno;
|
|
|
b12ff75 |
}
|
|
|
b12ff75 |
@@ -87,7 +86,7 @@ static int write_state(FILE *f0, char **states) {
|
|
|
b12ff75 |
static int execute(char **modes, char **states) {
|
|
|
b12ff75 |
char* arguments[4];
|
|
|
b12ff75 |
int r;
|
|
|
b12ff75 |
- FILE *f;
|
|
|
b12ff75 |
+ _cleanup_fclose_ FILE *f = NULL;
|
|
|
b12ff75 |
const char* note = strappenda("SLEEP=", arg_verb);
|
|
|
b12ff75 |
|
|
|
b12ff75 |
/* This file is opened first, so that if we hit an error,
|
|
|
b12ff75 |
@@ -115,7 +114,7 @@ static int execute(char **modes, char **states) {
|
|
|
b12ff75 |
note,
|
|
|
b12ff75 |
NULL);
|
|
|
b12ff75 |
|
|
|
b12ff75 |
- r = write_state(f, states);
|
|
|
b12ff75 |
+ r = write_state(&f, states);
|
|
|
b12ff75 |
if (r < 0)
|
|
|
b12ff75 |
return r;
|
|
|
b12ff75 |
|