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

Commit a0ddddb6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "libsnapshot: Fix uninitialized variables" am: e27781db 

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

Change-Id: I8d3ad7365a54576d9286c15e69fb930d39c1d48e
parents 41aa2489 e27781db

fs_mgr/libsnapshot/make_cow_from_ab_ota.cpp

+2 −2
Original line number Diff line number Diff line
@@ -252,7 +252,7 @@ static uint64_t SizeOfAllExtents(const T& extents) { 


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 @@ template <typename ContainerType> 
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_) {