diff options
| -rw-r--r-- | src/libsystemd/sd-bus/bus-error.c | 2 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/test-bus-error.c | 13 |
2 files changed, 14 insertions, 1 deletions
diff --git a/src/libsystemd/sd-bus/bus-error.c b/src/libsystemd/sd-bus/bus-error.c index 2e64b925f3..ad1a66da72 100644 --- a/src/libsystemd/sd-bus/bus-error.c +++ b/src/libsystemd/sd-bus/bus-error.c @@ -80,7 +80,7 @@ static int bus_error_mapping_lookup(const char *name, size_t len) { const sd_bus_name_error_mapping *m; for (m = __start_sd_bus_errnomap; m < __stop_sd_bus_errnomap; m++) - if (strneq(m->name, name, len)) + if (m->name && strneq(m->name, name, len)) return m->code; return EIO; diff --git a/src/libsystemd/sd-bus/test-bus-error.c b/src/libsystemd/sd-bus/test-bus-error.c index dd0cca4ab8..aff34a90cd 100644 --- a/src/libsystemd/sd-bus/test-bus-error.c +++ b/src/libsystemd/sd-bus/test-bus-error.c @@ -111,6 +111,18 @@ static void test_error(void) { assert_se(sd_bus_error_is_set(&error)); } +extern const sd_bus_name_error_mapping __start_sd_bus_errnomap[]; +extern const sd_bus_name_error_mapping __stop_sd_bus_errnomap[]; + +static void dump_mapping_table(void) { + const sd_bus_name_error_mapping *m; + + printf("----- errno mappings ------\n"); + for (m = __start_sd_bus_errnomap; m < __stop_sd_bus_errnomap; m++) + printf("%s -> %d\n", m->name, m->code); + printf("---------------------------\n"); +} + static void test_errno_mapping_standard(void) { assert_se(sd_bus_error_set(NULL, "System.Error.EUCLEAN", NULL) == -EUCLEAN); assert_se(sd_bus_error_set(NULL, "System.Error.EBUSY", NULL) == -EBUSY); @@ -130,6 +142,7 @@ static void test_errno_mapping_custom(void) { } int main(int argc, char *argv[]) { + dump_mapping_table(); test_error(); test_errno_mapping_standard(); |