| commit | 383fb1075a9512eb814fab1484d8e91fb207e50f | [log] [tgz] |
|---|---|---|
| author | George Chang <georgekgchang@google.com> | Thu Mar 31 10:55:38 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Mar 31 10:55:38 2022 +0000 |
| tree | c4dee6507c99a301088aa9503a42305929d80672 | |
| parent | 89fc01d37a6537f1e23703a14903275f64b561c3 [diff] | |
| parent | 669b076732d5e56e0656d05754a39d4ef6373e54 [diff] |
Merge "Use after free in phTmlNfc_TmlThread" am: fa18b22e8c am: fd8728eae8 am: 669b076732 Original change: https://android-review.googlesource.com/c/platform/hardware/nxp/nfc/+/2047663 Change-Id: I897dd4e195b3216e4e7ce9e552032b9521a103c1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/snxxx/halimpl/tml/phTmlNfc.cc b/snxxx/halimpl/tml/phTmlNfc.cc index df23422..a52c794 100644 --- a/snxxx/halimpl/tml/phTmlNfc.cc +++ b/snxxx/halimpl/tml/phTmlNfc.cc
@@ -169,7 +169,7 @@ /* Clean up all the TML resources if any error */ if (NFCSTATUS_SUCCESS != wInitStatus) { /* Clear all handles and memory locations initialized during init */ - phTmlNfc_CleanUp(); + phTmlNfc_Shutdown_CleanUp(); } return wInitStatus;