Fix potential memory leak when attestation delegate is set (#24906)

project-chip · Aug 17, 2023 · 1103184 · 1103184
1 parent 4c3567f
commit 1103184
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/src/controller/java/DeviceAttestationDelegateBridge.cpp b/src/controller/java/DeviceAttestationDelegateBridge.cpp
@@ -79,6 +79,9 @@ void DeviceAttestationDelegateBridge::OnDeviceAttestationCompleted(
         VerifyOrReturn(deviceAttestationDelegateCls != nullptr,
                        ChipLogError(Controller, "Could not find device attestation delegate class."));
 
+        // Auto delete deviceAttestationDelegateCls object when exit from the local scope
+        JniClass deviceAttestationDelegateJniCls(deviceAttestationDelegateCls);
+
         if (env->IsInstanceOf(mDeviceAttestationDelegate, deviceAttestationDelegateCls))
         {
             jmethodID onDeviceAttestationCompletedMethod;
@@ -87,10 +90,17 @@ void DeviceAttestationDelegateBridge::OnDeviceAttestationCompleted(
                                                     &onDeviceAttestationCompletedMethod);
             VerifyOrReturn(onDeviceAttestationCompletedMethod != nullptr,
                            ChipLogError(Controller, "Could not find deviceAttestation completed method"));
-            jobject javaAttestationInfo;
-            CHIP_ERROR err = N2J_AttestationInfo(env, info, javaAttestationInfo);
-            VerifyOrReturn(err == CHIP_NO_ERROR,
-                           ChipLogError(Controller, "Failed to create AttestationInfo, error: %s", err.AsString()));
+
+            jobject javaAttestationInfo = nullptr;
+
+            //  Don't need to pass attestationInfo for additional verification when attestation failed.
+            if (attestationResult == chip::Credentials::AttestationVerificationResult::kSuccess)
+            {
+                CHIP_ERROR err = N2J_AttestationInfo(env, info, javaAttestationInfo);
+                VerifyOrReturn(err == CHIP_NO_ERROR,
+                               ChipLogError(Controller, "Failed to create AttestationInfo, error: %s", err.AsString()));
+            }
+
             env->CallVoidMethod(mDeviceAttestationDelegate, onDeviceAttestationCompletedMethod, reinterpret_cast<jlong>(device),
                                 javaAttestationInfo, static_cast<jint>(attestationResult));
         }