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

Commit 7ce60542 authored by Marco Nelissen's avatar Marco Nelissen Committed by android-build-merger
Browse files

Merge "AUtils: disable overflow checks for isInRange" 

am: 85f1c3c5

* commit '85f1c3c5':
  AUtils: disable overflow checks for isInRange

Change-Id: I32014556343f98f17db3bce6a28ec62bd80faf0b
parents b5ab355f 85f1c3c5

include/media/stagefright/foundation/AUtils.h

+2 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ void ENSURE_UNSIGNED_TYPE() { 


// needle is in range [hayStart, hayStart + haySize)

template<class T, class U>

__attribute__((no_sanitize("integer")))

inline static bool isInRange(const T &hayStart, const U &haySize, const T &needle) {

    ENSURE_UNSIGNED_TYPE<U>();

    return (T)(hayStart + haySize) >= hayStart && needle >= hayStart && (U)(needle - hayStart) < haySize;
@@ -75,6 +76,7 @@ inline static bool isInRange(const T &hayStart, const U &haySize, const T &needl 


// [needleStart, needleStart + needleSize) is in range [hayStart, hayStart + haySize)

template<class T, class U>

__attribute__((no_sanitize("integer")))

inline static bool isInRange(

        const T &hayStart, const U &haySize, const T &needleStart, const U &needleSize) {

    ENSURE_UNSIGNED_TYPE<U>();