commit 7b4e9a582c3cb071e3044928b21fed3fea657b19
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Feb 12 02:43:14 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Feb 12 02:43:14 2020 +0000
tree fc9285d3a39e5f41c3932384114994d81dff14ea
parent 4e84c79205233b30f4b76dbda53bd5db6a26e07d
parent 10640c0ea5d8bce3b8800f8de0d66860a7a96586

Merge "storaged:Thread out of sync will cause null pointer crash" am: 2929ab63e3 am: 38669ed46d am: eda17739dd

Change-Id: If695fe32c32fb597286c7de710a030259743ba17

storaged/main.cpp

diff --git a/storaged/main.cpp b/storaged/main.cpp
index e35bd6f..a7bda14 100644
--- a/storaged/main.cpp
+++ b/storaged/main.cpp
@@ -46,11 +46,6 @@
 
 // Function of storaged's main thread
 void* storaged_main(void* /* unused */) {
-    storaged_sp = new storaged_t();
-
-    storaged_sp->init();
-    storaged_sp->report_storage_info();
-
     LOG(INFO) << "storaged: Start";
 
     for (;;) {
@@ -123,6 +118,9 @@
 
     if (flag_main_service) { // start main thread
         // Start the main thread of storaged
+        storaged_sp = new storaged_t();
+        storaged_sp->init();
+        storaged_sp->report_storage_info();
         pthread_t storaged_main_thread;
         errno = pthread_create(&storaged_main_thread, NULL, storaged_main, NULL);
         if (errno != 0) {