commit 219cbd7f8c2cf25951568bbd2ef5bf62d48b2423
author Alex Buynytskyy <alexbuy@google.com> Thu Jul 15 17:28:13 2021 -0700
committer Alex Buynytskyy <alexbuy@google.com> Thu Jul 15 17:28:13 2021 -0700
tree eb839d72ed42139dafa6f06e5e2f3fce298a234e
parent 0871e916ef27a7cc7c5ac5f125ffd61d7f5f5400

Don't crash on failed DataLoader creation.

Bug: 193749733
Fixes: 193749733
Test: atest GtsIncrementalInstallProxyHostTestCases
Change-Id: I65d9f7d6a5abed5eae42518c87235dc791a06a5f

libdataloader/DataLoaderConnector.cpp

diff --git a/libdataloader/DataLoaderConnector.cpp b/libdataloader/DataLoaderConnector.cpp
index 91ff74e..f5f82ea 100644
--- a/libdataloader/DataLoaderConnector.cpp
+++ b/libdataloader/DataLoaderConnector.cpp
@@ -318,11 +318,11 @@
     DataLoaderConnector(const DataLoaderConnector&) = delete;
     DataLoaderConnector(const DataLoaderConnector&&) = delete;
     virtual ~DataLoaderConnector() {
-        CHECK(mDataLoader);
-        if (mDataLoader->onDestroy) {
+        if (mDataLoader && mDataLoader->onDestroy) {
             mDataLoader->onDestroy(mDataLoader);
+            checkAndClearJavaException(__func__);
         }
-        checkAndClearJavaException(__func__);
+        mDataLoader = nullptr;
 
         JNIEnv* env = GetOrAttachJNIEnvironment(mJvm);