diff options
| author | Sander Vrijders <[email protected]> | 2017-08-29 11:23:52 +0000 |
|---|---|---|
| committer | dimitri staessens <[email protected]> | 2017-08-29 11:23:52 +0000 |
| commit | 00aeb6ee00efa98c7e2d6d9bebeb1c4799ba1705 (patch) | |
| tree | d86a1c02b36cfc5feea1ba5f22c6899f8a6c0c9c /src/ipcpd/normal | |
| parent | e8875c08ac04a1d9aca342d94d4f788239334f72 (diff) | |
| parent | 4de841c26b7208d5395da349ea16c937b1361414 (diff) | |
| download | ouroboros-00aeb6ee00efa98c7e2d6d9bebeb1c4799ba1705.tar.gz ouroboros-00aeb6ee00efa98c7e2d6d9bebeb1c4799ba1705.zip | |
Merged in sandervrijders/ouroboros/be-bugfixes (pull request #573)
lib, ipcpd, irmd: Fix bugs reported by static analysis
Diffstat (limited to 'src/ipcpd/normal')
| -rw-r--r-- | src/ipcpd/normal/dht.c | 3 | ||||
| -rw-r--r-- | src/ipcpd/normal/pol/graph.c | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/ipcpd/normal/dht.c b/src/ipcpd/normal/dht.c index b5d52d93..b5bac913 100644 --- a/src/ipcpd/normal/dht.c +++ b/src/ipcpd/normal/dht.c @@ -745,7 +745,8 @@ static void lookup_update(struct dht * dht, } else { struct contact * d; list_add_tail(&c->next, p); - d = list_last_entry(&lu->contacts, struct contact, next); + d = list_last_entry(&lu->contacts, + struct contact, next); list_del(&d->next); contact_destroy(d); } diff --git a/src/ipcpd/normal/pol/graph.c b/src/ipcpd/normal/pol/graph.c index 3611f0b0..9901fbaa 100644 --- a/src/ipcpd/normal/pol/graph.c +++ b/src/ipcpd/normal/pol/graph.c @@ -454,9 +454,10 @@ ssize_t graph_routing_table(struct graph * graph, pthread_mutex_lock(&graph->lock); - if (graph->nr_vertices == 0) { + /* We need at least 2 vertices for a table */ + if (graph->nr_vertices < 2) { pthread_mutex_unlock(&graph->lock); - return 0; + return -1; } prevs = dijkstra(graph, s_addr); |