commit cf50ede5c3043d33fdc9466cc2a029a6b539998a
author Bill Rassieur <rassb@google.com> Wed Oct 10 17:29:22 2018 +0000
committer Bill Rassieur <rassb@google.com> Wed Oct 10 17:29:22 2018 +0000
tree ac224f88b4e396cf812f77201b51af32623b14aa
parent 412a7e50a9e9b88bee3f4154e49df7d975377194
parent 3c01c6b04007d09341bf51e2938714ae8a10276e

Merge PPR2.181005.003 from pi-release-2 into pi-platform-release.

Change-Id: I5cb4703b4ba0bca1db085cb7292bbac9cfe29710
BUG: 117431430

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) {