commit a0ddddb69c799fc9712edfee0f9a2db236068aa4
author Treehugger Robot <treehugger-gerrit@google.com> Thu Aug 27 18:51:18 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Aug 27 18:51:18 2020 +0000
tree b99c714906638a96ae5409e99fcd4e01601975a0
parent 41aa2489ec1955fe1eeb57a46f7430746c92de06
parent e27781db4c88f1e79348cf2d38cbf01010c85145

Merge "libsnapshot: Fix uninitialized variables" am: e27781db4c

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

Change-Id: I8d3ad7365a54576d9286c15e69fb930d39c1d48e

fs_mgr/libsnapshot/make_cow_from_ab_ota.cpp

diff --git a/fs_mgr/libsnapshot/make_cow_from_ab_ota.cpp b/fs_mgr/libsnapshot/make_cow_from_ab_ota.cpp
index 0b40fd6..d0b8f52 100644
--- a/fs_mgr/libsnapshot/make_cow_from_ab_ota.cpp
+++ b/fs_mgr/libsnapshot/make_cow_from_ab_ota.cpp
@@ -252,7 +252,7 @@
 
 class PuffInputStream final : public puffin::StreamInterface {
   public:
-    PuffInputStream(uint8_t* buffer, size_t length) : buffer_(buffer), length_(length) {}
+    PuffInputStream(uint8_t* buffer, size_t length) : buffer_(buffer), length_(length), pos_(0) {}
 
     bool GetSize(uint64_t* size) const override {
         *size = length_;
@@ -472,7 +472,7 @@
 class ExtentIter final {
   public:
     ExtentIter(const ContainerType& container)
-        : iter_(container.cbegin()), end_(container.cend()) {}
+        : iter_(container.cbegin()), end_(container.cend()), dst_index_(0) {}
 
     bool GetNext(uint64_t* block) {
         while (iter_ != end_) {