tree-wide: check parameter before dereferencing

This commit is contained in:
David Tardon
2022-09-13 08:13:42 +02:00
parent 995340074e
commit c9958c4fc5
5 changed files with 28 additions and 8 deletions
+4 -2
View File
@@ -1373,10 +1373,12 @@ void job_shutdown_magic(Job *j) {
int job_get_timeout(Job *j, usec_t *timeout) {
usec_t x = USEC_INFINITY, y = USEC_INFINITY;
Unit *u = j->unit;
Unit *u;
int r;
assert(u);
assert(j);
u = ASSERT_PTR(j->unit);
if (j->timer_event_source) {
r = sd_event_source_get_time(j->timer_event_source, &x);
+3 -1
View File
@@ -1448,10 +1448,12 @@ int unit_load_fragment_and_dropin(Unit *u, bool fragment_required) {
}
void unit_add_to_target_deps_queue(Unit *u) {
Manager *m = u->manager;
Manager *m;
assert(u);
m = ASSERT_PTR(u->manager);
if (u->in_target_deps_queue)
return;
+1 -1
View File
@@ -36,7 +36,7 @@ void journal_importer_cleanup(JournalImporter *imp) {
}
static char* realloc_buffer(JournalImporter *imp, size_t size) {
char *b, *old = imp->buf;
char *b, *old = ASSERT_PTR(imp)->buf;
b = GREEDY_REALLOC(imp->buf, size);
if (!b)
+5 -1
View File
@@ -95,9 +95,13 @@ static int idle_time_cb(sd_event_source *s, uint64_t usec, void *userdata) {
}
static int connection_release(Connection *c) {
Context *context = c->context;
Context *context;
int r;
assert(c);
context = ASSERT_PTR(c->context);
connection_free(c);
if (arg_exit_idle_time < USEC_INFINITY && set_isempty(context->connections)) {
+15 -3
View File
@@ -241,12 +241,16 @@ static ssize_t udev_event_subst_format(
size_t l,
bool *ret_truncated) {
sd_device *parent, *dev = event->dev;
sd_device *parent, *dev;
const char *val = NULL;
bool truncated = false;
char *s = dest;
int r;
assert(event);
dev = ASSERT_PTR(event->dev);
switch (type) {
case FORMAT_SUBST_DEVPATH:
r = sd_device_get_devpath(dev, &val);
@@ -938,9 +942,13 @@ static int rename_netif(UdevEvent *event) {
}
static int update_devnode(UdevEvent *event) {
sd_device *dev = event->dev;
sd_device *dev;
int r;
assert(event);
dev = ASSERT_PTR(event->dev);
r = sd_device_get_devnum(dev, NULL);
if (r == -ENOENT)
return 0;
@@ -982,9 +990,13 @@ static int event_execute_rules_on_remove(
Hashmap *properties_list,
UdevRules *rules) {
sd_device *dev = event->dev;
sd_device *dev;
int r;
assert(event);
dev = ASSERT_PTR(event->dev);
r = device_read_db_internal(dev, true);
if (r < 0)
log_device_debug_errno(dev, r, "Failed to read database under /run/udev/data/: %m");