diff options
| author | Tom Gundersen <teg@jklm.no> | 2015-08-27 21:38:36 +0200 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2015-08-27 21:38:36 +0200 |
| commit | 4a316c44aa6222f3abc7ed2d50d00a0817cd4466 (patch) | |
| tree | a66424ffac18c715c70fce1484366cd3c7a9415d /src/libsystemd/sd-bus | |
| parent | d56cc298808b2dbfa28ae893d6f47f34df3196b1 (diff) | |
| parent | c2c940bda03a07fbacfa3df2590ed865ec3dcc22 (diff) | |
Merge pull request #1055 from poettering/dhcp-updates
Various networkd and dhcp updates
Diffstat (limited to 'src/libsystemd/sd-bus')
| -rw-r--r-- | src/libsystemd/sd-bus/bus-message.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c index a21ed8cb62..366a026426 100644 --- a/src/libsystemd/sd-bus/bus-message.c +++ b/src/libsystemd/sd-bus/bus-message.c @@ -1024,7 +1024,9 @@ _public_ const char *sd_bus_message_get_sender(sd_bus_message *m) { _public_ const sd_bus_error *sd_bus_message_get_error(sd_bus_message *m) { assert_return(m, NULL); - assert_return(sd_bus_error_is_set(&m->error), NULL); + + if (!sd_bus_error_is_set(&m->error)) + return NULL; return &m->error; } |