commit 5f6d228725cc2ef98f14e9bd8081cc2ae7d42f42
author gitbuildkicker <android-build@google.com> Tue Mar 28 00:07:35 2017 -0700
committer gitbuildkicker <android-build@google.com> Tue Mar 28 00:07:35 2017 -0700
tree 5a9694160ed8928c32aad04b028e01d0625bc0f4
parent 16477a409310e8daa3ec5c8ecaa7a2f2d471fb93
parent bab89544750ef4da01dc83285ff95d779dcf4eb6

merge in oc-release history after reset to master

src/racoon/grabmyaddr.c

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;