Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f2d3af87 authored by Songchun Fan's avatar Songchun Fan Committed by Automerger Merge Worker
Browse files

Merge "[incremental service] avoid nullptr dereferencing" into rvc-dev am:... 

Merge "[incremental service] avoid nullptr dereferencing" into rvc-dev am: eee228f6 am: 2575a8b6 am: f8618237

Change-Id: I3248f0c864157d911e36b9b32f1c8851f6d28031
parents fc6d6c81 f8618237

services/incremental/IncrementalService.cpp

+5 −3
Original line number Original line Diff line number Diff line
@@ -1089,7 +1089,9 @@ bool IncrementalService::prepareDataLoader(IncrementalService::IncFsMount& ifs, 
            base::unique_fd(::dup(ifs.control.pendingReads)));

            base::unique_fd(::dup(ifs.control.pendingReads)));

    fsControlParcel.incremental->log.reset(base::unique_fd(::dup(ifs.control.logs)));

    fsControlParcel.incremental->log.reset(base::unique_fd(::dup(ifs.control.logs)));

    sp<IncrementalDataLoaderListener> listener =

    sp<IncrementalDataLoaderListener> listener =

            new IncrementalDataLoaderListener(*this, *externalListener);

            new IncrementalDataLoaderListener(*this,

                                              externalListener ? *externalListener

                                                               : DataLoaderStatusListener());

    bool created = false;

    bool created = false;

    auto status = mDataLoaderManager->initializeDataLoader(ifs.mountId, *dlp, fsControlParcel,

    auto status = mDataLoaderManager->initializeDataLoader(ifs.mountId, *dlp, fsControlParcel,

                                                           listener, &created);

                                                           listener, &created);
@@ -1229,8 +1231,8 @@ binder::Status IncrementalService::IncrementalDataLoaderListener::onStatusChange 
        std::unique_lock l(incrementalService.mLock);

        std::unique_lock l(incrementalService.mLock);

        const auto& ifs = incrementalService.getIfsLocked(mountId);

        const auto& ifs = incrementalService.getIfsLocked(mountId);

        if (!ifs) {

        if (!ifs) {

            LOG(WARNING) << "Received data loader status " << int(newStatus) << " for unknown mount "

            LOG(WARNING) << "Received data loader status " << int(newStatus)

                         << mountId;

                         << " for unknown mount " << mountId;

            return binder::Status::ok();

            return binder::Status::ok();

        }

        }

        ifs->dataLoaderStatus = newStatus;

        ifs->dataLoaderStatus = newStatus;