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

Commit 242d6095 authored by Bill Yi's avatar Bill Yi Committed by Android (Google) Code Review
Browse files

Merge "Merge RQ2A.210405.006 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master

parents d6a1875b 5137d519
Loading
Loading
Loading
Loading
+5 −1
Original line number Diff line number Diff line
@@ -124,7 +124,11 @@ namespace implementation {
            return Void();
        }

        if (source.offset + offset + source.size > sourceBase->getSize()) {
        size_t totalSize = 0;
        if (__builtin_add_overflow(source.offset, offset, &totalSize) ||
            __builtin_add_overflow(totalSize, source.size, &totalSize) ||
            totalSize > sourceBase->getSize()) {
            android_errorWriteLog(0x534e4554, "176496160");
            _hidl_cb(Status::ERROR_DRM_CANNOT_HANDLE, 0, "invalid buffer size");
            return Void();
        }