Merge "Fix nullptr access when cow reader open fails" am: 9e6005ada4 am: 9d1460be06

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2325397

Change-Id: I2b462357d94ca424798490f0fc8418b0c925535f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2022-12-02 20:39:06 +00:00 committed by Automerger Merge Worker
commit cadcf82fe9

View file

@ -93,6 +93,9 @@ bool CompressedSnapshotWriter::VerifyMergeOps() const noexcept {
std::unique_ptr<FileDescriptor> CompressedSnapshotWriter::OpenReader() {
auto cow = OpenCowReader();
if (cow == nullptr) {
return nullptr;
}
auto reader = std::make_unique<CompressedSnapshotReader>();
if (!reader->SetCow(std::move(cow))) {