Merge "Add null checking to two protectFromVpn calls" am: 335d482d9d am: afbdf60e1d
am: 476bfca7f6
Change-Id: I3b88239b8eb7b0c6ce6c747b3f1bbb2fef458d47
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 @@
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 @@
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;