diff options
| author | Beniamino Galvani <bgalvani@redhat.com> | 2017-07-21 08:46:57 +0200 |
|---|---|---|
| committer | Beniamino Galvani <bgalvani@redhat.com> | 2017-07-21 09:04:53 +0200 |
| commit | c8a7012a9bd07c930ee042c6e471ee1b6f55e06f (patch) | |
| tree | 722ddc65b31fc2c142bc018e519fd52ad8be4e31 | |
| parent | 8e2102a4be27facbe2d0493e0e9a9e3ca4d7162e (diff) | |
| download | NetworkManager-c8a7012a9bd07c930ee042c6e471ee1b6f55e06f.tar.gz | |
fixup! platform: refactor nm_platform_ip4_address_sync()
src/platform/nm-platform.c: In function ‘nm_platform_ip4_address_sync’:
src/platform/nm-platform.c:3297:8: error: ‘known_address’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
if (!nm_utils_lifetime_get (known_address->timestamp, known_address->lifetime, known_address->preferred,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
now, &lifetime, &preferred)) {
~~~~~~~~~~~~~~~~~~~~~~~~~~~
| -rw-r--r-- | src/platform/nm-platform.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/platform/nm-platform.c b/src/platform/nm-platform.c index bd9015b551..c8c7663e0e 100644 --- a/src/platform/nm-platform.c +++ b/src/platform/nm-platform.c @@ -3294,12 +3294,12 @@ delete_and_next: if (!o) continue; + known_address = NMP_OBJECT_CAST_IP4_ADDRESS (o); + if (!nm_utils_lifetime_get (known_address->timestamp, known_address->lifetime, known_address->preferred, - now, &lifetime, &preferred)) { + now, &lifetime, &preferred)) goto delete_and_next2; - } - known_address = NMP_OBJECT_CAST_IP4_ADDRESS (known_addresses->pdata[i]); if (!nm_platform_ip4_address_add (self, ifindex, known_address->address, known_address->plen, known_address->peer_address, lifetime, preferred, 0, known_address->label)) |