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

bus: fix access to unitialized variable in error path

Browse source 
src/machine/machined-dbus.c:237:13: warning: Branch condition evaluates to a garbage value
        if (m)
            ^
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2013-10-11 19:33:43 -04:00
parent 6891529fe1
commit a3e7f417d7
2 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/libsystemd-bus/bus-message.c
View file

@ -639,7 +639,6 @@ int sd_bus_message_new_method_errorf(
const char *format, const char *format,
...) { ...) {
_cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
sd_bus_message *t; sd_bus_message *t;
va_list ap; va_list ap;
int r; int r;

18
src/machine/machined-dbus.c
View file

@ -203,7 +203,7 @@ static int bus_manager_create_machine(Manager *manager, DBusMessage *message) {
r = manager_add_machine(manager, name, &m); r = manager_add_machine(manager, name, &m);
if (r < 0) if (r < 0)
goto fail; return r;
m->leader = leader; m->leader = leader;
m->class = c; m->class = c;
@ -234,8 +234,7 @@ static int bus_manager_create_machine(Manager *manager, DBusMessage *message) {
return 0; return 0;
fail: fail:
if (m) machine_add_to_gc_queue(m);
machine_add_to_gc_queue(m);
return r; return r;
} }
@ -1003,17 +1002,12 @@ int manager_add_machine(Manager *m, const char *name, Machine **_machine) {
assert(name); assert(name);
machine = hashmap_get(m->machines, name); machine = hashmap_get(m->machines, name);
if (machine) { if (!machine) {
if (_machine) machine = machine_new(m, name);
*_machine = machine; if (!machine)
return -ENOMEM;
return 0;
} }
machine = machine_new(m, name);
if (!machine)
return -ENOMEM;
if (_machine) if (_machine)
*_machine = machine; *_machine = machine;