aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin Lee <rgl@google.com>2017-03-27 17:12:11 +0100
committerRobin Lee <rgl@google.com>2017-03-27 17:12:11 +0100
commit47cf5bd84386e63f7cdbe5de86b426d1608407b6 (patch)
tree0d2338ec36d41e933cce2bb7e308cd52078dbad3
parente973da9ba410f8344080deacec70fc2c56d7947e (diff)
downloadipsec-tools-47cf5bd84386e63f7cdbe5de86b426d1608407b6.tar.gz
Add null checking to two protectFromVpn calls
The code directly after both of these checks for null first, so to be consistent new bits should too. Change-Id: Iac6cd25de3ae9d3d1dd5d3780ef6fc1189f1334a
-rw-r--r--src/racoon/grabmyaddr.c8
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;