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

Commit 4fd0eb7f authored by Marco Nelissen's avatar Marco Nelissen Committed by android-build-merger
Browse files

Merge "Fix integer overflows" into nyc-dev 

am: 65f611a0

* commit '65f611a0':
  Fix integer overflows

Change-Id: Id316a623262481d30e5e05215d8930ff8f103d27
parents 27ae987f 65f611a0

media/libstagefright/avc_utils.cpp

+2 −2
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ unsigned parseUEWithFallback(ABitReader *br, unsigned fallback) { 
signed parseSE(ABitReader *br) {

    unsigned codeNum = parseUE(br);



    return (codeNum & 1) ? (codeNum + 1) / 2 : -(codeNum / 2);

    return (codeNum & 1) ? (codeNum + 1) / 2 : -signed(codeNum / 2);

}



signed parseSEWithFallback(ABitReader *br, signed fallback) {
@@ -71,7 +71,7 @@ signed parseSEWithFallback(ABitReader *br, signed fallback) { 
    if (codeNum == ~0U) {

        return fallback;

    }

    return (codeNum & 1) ? (codeNum + 1) / 2 : -(codeNum / 2);

    return (codeNum & 1) ? (codeNum + 1) / 2 : -signed(codeNum / 2);

}



static void skipScalingList(ABitReader *br, size_t sizeOfScalingList) {