commit 81fb83be41f270d99bd623352d3646aa5a416fdd
author android-build-team Robot <android-build-team-robot@google.com> Fri Aug 10 03:17:08 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Fri Aug 10 03:17:08 2018 +0000
tree a9d1513e9f86c040e85c89aa9caef1c67035a0f0
parent e4fc3f79435029de931a0c6e6f06b5d98b84915b
parent 5dfde51af64df333d33a9df9897ac8e05e67da63

Snap for 4945494 from 5dfde51af64df333d33a9df9897ac8e05e67da63 to pi-qpr1-release

Change-Id: Ia1c0ef9f55f4768882ee385ceaf93993dd429460

server/XfrmController.cpp

diff --git a/server/XfrmController.cpp b/server/XfrmController.cpp
index b9a5a41..6f7bf2f 100644
--- a/server/XfrmController.cpp
+++ b/server/XfrmController.cpp
@@ -436,7 +436,7 @@
     }
 
     int optval;
-    socklen_t optlen;
+    socklen_t optlen = sizeof(optval);
     netdutils::Status status =
         getSyscallInstance().getsockopt(Fd(socket), IPPROTO_UDP, UDP_ENCAP, &optval, &optlen);
     if (status != netdutils::status::ok) {