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

Commit 9a995785 authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Silently ignore duplicate heap entries 

am: cecd6401

* commit 'cecd6401':
  Silently ignore duplicate heap entries

Change-Id: I67edc2bdedbd28bf4b11a071e132ae213d143bc1
parents f3a81cad cecd6401

libmemunreachable/HeapWalker.cpp

+7 −5
Original line number Diff line number Diff line
@@ -41,11 +41,13 @@ bool HeapWalker::Allocation(uintptr_t begin, uintptr_t end) { 
    return true;

  } else {

    Range overlap = inserted.first->first;

    if (overlap != range) {

      ALOGE("range %p-%p overlaps with existing range %p-%p",

          reinterpret_cast<void*>(begin),

          reinterpret_cast<void*>(end),

          reinterpret_cast<void*>(overlap.begin),

          reinterpret_cast<void*>(overlap.end));

    }

    return false;

  }

}

libmemunreachable/HeapWalker.h

+6 −0
Original line number Diff line number Diff line
@@ -31,6 +31,12 @@ struct Range { 
  uintptr_t end;



  size_t size() const { return end - begin; };

  bool operator==(const Range& other) const {

    return this->begin == other.begin && this->end == other.end;

  }

  bool operator!=(const Range& other) const {

    return !(*this == other);

  }

};



// Comparator for Ranges that returns equivalence for overlapping ranges