commit 53842aa1b3525d2f543c1bf4a358bb7ffc4e05e7
author Andres Morales <anmorales@google.com> Fri Jul 10 18:14:14 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Jul 10 18:14:14 2015 +0000
tree 749d6794f8eeed7bc71a4f607840081fa16d7ef7
parent dbe2de8e8df1d6a0c716d5ce80ac0f04d7082fab
parent 701c70132021dcbad5fdcab2a51842d2a89d3cd4

am a5c8358a: am 787c3764: Merge "[gatekeeperd] fix use of uninitialized memory" into mnc-dev

* commit 'a5c8358a31a62315b9904d508316d3d4ca962d93':
  [gatekeeperd] fix use of uninitialized memory

gatekeeperd/gatekeeperd.cpp

diff --git a/gatekeeperd/gatekeeperd.cpp b/gatekeeperd/gatekeeperd.cpp
index cd6d18f..9788681 100644
--- a/gatekeeperd/gatekeeperd.cpp
+++ b/gatekeeperd/gatekeeperd.cpp
@@ -50,6 +50,8 @@
 public:
     GateKeeperProxy() {
         int ret = hw_get_module_by_class(GATEKEEPER_HARDWARE_MODULE_ID, NULL, &module);
+        device = NULL;
+
         if (ret < 0) {
             ALOGW("falling back to software GateKeeper");
             soft_device.reset(new SoftGateKeeperDevice());