diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-03-27 23:20:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-03-27 23:20:40 +0000 |
| commit | 335d482d9deb7ffdce68f70653e3cf2dcd62c2a7 (patch) | |
| tree | 0d2338ec36d41e933cce2bb7e308cd52078dbad3 | |
| parent | e973da9ba410f8344080deacec70fc2c56d7947e (diff) | |
| parent | 47cf5bd84386e63f7cdbe5de86b426d1608407b6 (diff) | |
| download | ipsec-tools-335d482d9deb7ffdce68f70653e3cf2dcd62c2a7.tar.gz | |
Merge "Add null checking to two protectFromVpn calls"
| -rw-r--r-- | src/racoon/grabmyaddr.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/racoon/grabmyaddr.c b/src/racoon/grabmyaddr.c index 057084e..dae4690 100644 --- a/src/racoon/grabmyaddr.c +++ b/src/racoon/grabmyaddr.c @@ -416,7 +416,9 @@ grab_myaddrs() addr1, ifap->ifa_name); q = find_myaddr(old, p); #ifdef ANDROID_CHANGES - protectFromVpn(q->sock); + if (q) { + protectFromVpn(q->sock); + } #endif if (q) p->sock = q->sock; @@ -539,7 +541,9 @@ grab_myaddrs() addr1, ifr->ifr_name); q = find_myaddr(old, p); #ifdef ANDROID_CHANGES - protectFromVpn(q->sock); + if (q) { + protectFromVpn(q->sock); + } #endif if (q) p->sock = q->sock; |