You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
53 lines
1.6 KiB
53 lines
1.6 KiB
7 years ago
|
From 69aaf3c41923fafd9616b1bbec51fa6bcb23b886 Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
||
|
|
Date: Sat, 7 Mar 2015 15:05:50 -0500
|
||
|
|
Subject: [PATCH] bus: fix leak in error path
|
||
|
|
|
||
|
|
CID #1271349.
|
||
|
|
|
||
|
|
Cherry-picked from: bcf88fc3f14867f1cabc911c27b661d738281df0
|
||
|
|
Related: #1331667
|
||
|
|
---
|
||
|
|
src/libsystemd/sd-bus/bus-message.c | 9 ++++-----
|
||
|
|
1 file changed, 4 insertions(+), 5 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c
|
||
|
|
index 295930303..c8402a23a 100644
|
||
|
|
--- a/src/libsystemd/sd-bus/bus-message.c
|
||
|
|
+++ b/src/libsystemd/sd-bus/bus-message.c
|
||
|
|
@@ -441,7 +441,7 @@ int bus_message_from_header(
|
||
|
|
size_t extra,
|
||
|
|
sd_bus_message **ret) {
|
||
|
|
|
||
|
|
- sd_bus_message *m;
|
||
|
|
+ _cleanup_free_ sd_bus_message *m = NULL;
|
||
|
|
struct bus_header *h;
|
||
|
|
size_t a, label_sz;
|
||
|
|
|
||
|
|
@@ -460,15 +460,13 @@ int bus_message_from_header(
|
||
|
|
return -EBADMSG;
|
||
|
|
|
||
|
|
h = header;
|
||
|
|
- if (h->version != 1 &&
|
||
|
|
- h->version != 2)
|
||
|
|
+ if (!IN_SET(h->version, 1, 2))
|
||
|
|
return -EBADMSG;
|
||
|
|
|
||
|
|
if (h->type == _SD_BUS_MESSAGE_TYPE_INVALID)
|
||
|
|
return -EBADMSG;
|
||
|
|
|
||
|
|
- if (h->endian != BUS_LITTLE_ENDIAN &&
|
||
|
|
- h->endian != BUS_BIG_ENDIAN)
|
||
|
|
+ if (!IN_SET(h->endian, BUS_LITTLE_ENDIAN, BUS_BIG_ENDIAN))
|
||
|
|
return -EBADMSG;
|
||
|
|
|
||
|
|
/* Note that we are happy with unknown flags in the flags header! */
|
||
|
|
@@ -557,6 +555,7 @@ int bus_message_from_header(
|
||
|
|
|
||
|
|
m->bus = sd_bus_ref(bus);
|
||
|
|
*ret = m;
|
||
|
|
+ m = NULL;
|
||
|
|
|
||
|
|
return 0;
|
||
|
|
}
|