From 221baab13a7fce93d806968467f979a59ac5f2f9 Mon Sep 17 00:00:00 2001
From: Kevin Coppock <coppock@google.com>
Date: Thu, 13 Jan 2022 17:27:17 -0600
Subject: [PATCH] Ensure pointers in AndroidDeviceControllerWrapper are init to
 nullptr

Fixes #13556
---
 src/controller/java/AndroidDeviceControllerWrapper.h | 12 ++++++------
 third_party/qpg_sdk/repo                             |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/controller/java/AndroidDeviceControllerWrapper.h b/src/controller/java/AndroidDeviceControllerWrapper.h
index 02c26e1a1dcbe8..bddf910a077c7a 100644
--- a/src/controller/java/AndroidDeviceControllerWrapper.h
+++ b/src/controller/java/AndroidDeviceControllerWrapper.h
@@ -120,12 +120,12 @@ class AndroidDeviceControllerWrapper : public chip::Controller::DevicePairingDel
     bool mNodeIdRequested             = false;
 
     // These fields allow us to release the string/byte array memory later.
-    jstring ssidStr;
-    jstring passwordStr;
-    const char * ssid;
-    const char * password;
-    jbyteArray operationalDatasetBytes;
-    jbyte * operationalDataset;
+    jstring ssidStr                    = nullptr;
+    jstring passwordStr                = nullptr;
+    const char * ssid                  = nullptr;
+    const char * password              = nullptr;
+    jbyteArray operationalDatasetBytes = nullptr;
+    jbyte * operationalDataset         = nullptr;
 
     AndroidDeviceControllerWrapper(ChipDeviceControllerPtr controller) : mController(std::move(controller))
     {
diff --git a/third_party/qpg_sdk/repo b/third_party/qpg_sdk/repo
index 6bce6f11208c77..edb134291c9f0c 160000
--- a/third_party/qpg_sdk/repo
+++ b/third_party/qpg_sdk/repo
@@ -1 +1 @@
-Subproject commit 6bce6f11208c77dfc6bb1b9256bf01248ff002ab
+Subproject commit edb134291c9f0cb661c2e95dcf643cd334dca810