diff options
| author | Robin Lee <rgl@google.com> | 2017-03-27 23:23:47 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-03-27 23:23:47 +0000 |
| commit | afbdf60e1d4cafe0f894fe8e8e5bfa49e47c80b2 (patch) | |
| tree | 5a9694160ed8928c32aad04b028e01d0625bc0f4 | |
| parent | f1182befa0528dfd0a610598d2b8c34e24bf3762 (diff) | |
| parent | 335d482d9deb7ffdce68f70653e3cf2dcd62c2a7 (diff) | |
| download | ipsec-tools-afbdf60e1d4cafe0f894fe8e8e5bfa49e47c80b2.tar.gz | |
Merge "Add null checking to two protectFromVpn calls"android-wear-o-preview-4android-wear-o-preview-3android-o-preview-4android-o-preview-3android-o-preview-2android-o-iot-preview-5android-n-iot-preview-4o-iot-preview-5n-iot-preview-4
am: 335d482d9d
Change-Id: I89afe81145a933a668503ca275308ff668fee169
| -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; |