| commit | 305549390f29765a7b5a8285716520978acec6ca | [log] [tgz] |
|---|---|---|
| author | Andres Morales <anmorales@google.com> | Fri Jul 10 17:20:30 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Jul 10 17:20:31 2015 +0000 |
| tree | e8fef8c7066e51646c8cefea420b83eb4b653442 | |
| parent | 295414014b7f61cfc66477043932fe61cb5f6677 [diff] | |
| parent | 1d39bdb03a3c86039160bafbe5285bcdb061caf7 [diff] |
Merge "[gatekeeperd] fix use of uninitialized memory" into mnc-dev
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());