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

Commit fc7c7790 authored by Valerie Hau's avatar Valerie Hau Committed by android-build-merger
Browse files

DO NOT MERGE: Fixing overflow bug am: d41a4700 

am: 14e3c066

Change-Id: I1c42c01159a62e6971648c6bd739ee6460634051
parents a05b4683 14e3c066

libs/ui/GraphicBufferAllocator.cpp

+9 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 


#include <ui/GraphicBufferAllocator.h>



#include <limits.h>

#include <stdio.h>



#include <grallocusage/GrallocUsageConversion.h>
@@ -114,6 +115,14 @@ status_t GraphicBufferAllocator::allocate(uint32_t width, uint32_t height, 
    if (!width || !height)

        width = height = 1;



    const uint32_t bpp = bytesPerPixel(format);

    if (std::numeric_limits<size_t>::max() / width / height < static_cast<size_t>(bpp)) {

        ALOGE("Failed to allocate (%u x %u) layerCount %u format %d "

              "usage %" PRIx64 ": Requesting too large a buffer size",

              width, height, layerCount, format, usage);

        return BAD_VALUE;

    }



    // Ensure that layerCount is valid.

    if (layerCount < 1)

        layerCount = 1;
@@ -126,7 +135,6 @@ status_t GraphicBufferAllocator::allocate(uint32_t width, uint32_t height, 
    if (error == NO_ERROR) {

        Mutex::Autolock _l(sLock);

        KeyedVector<buffer_handle_t, alloc_rec_t>& list(sAllocList);

        uint32_t bpp = bytesPerPixel(format);

        alloc_rec_t rec;

        rec.width = width;

        rec.height = height;

libs/ui/tests/GraphicBuffer_test.cpp

+16 −0
Original line number Diff line number Diff line
@@ -35,6 +35,22 @@ constexpr uint64_t kTestUsage = GraphicBuffer::USAGE_SW_WRITE_OFTEN; 


class GraphicBufferTest : public testing::Test {};



TEST_F(GraphicBufferTest, AllocateNoError) {

    PixelFormat format = PIXEL_FORMAT_RGBA_8888;

    sp<GraphicBuffer> gb(new GraphicBuffer(kTestWidth, kTestHeight, format, kTestLayerCount,

                                           kTestUsage, std::string("test")));

    ASSERT_EQ(NO_ERROR, gb->initCheck());

}



TEST_F(GraphicBufferTest, AllocateBadDimensions) {

    PixelFormat format = PIXEL_FORMAT_RGBA_8888;

    uint32_t width, height;

    width = height = std::numeric_limits<uint32_t>::max();

    sp<GraphicBuffer> gb(new GraphicBuffer(width, height, format, kTestLayerCount, kTestUsage,

                                           std::string("test")));

    ASSERT_EQ(BAD_VALUE, gb->initCheck());

}



TEST_F(GraphicBufferTest, CreateFromBufferHubBuffer) {

    std::unique_ptr<BufferHubBuffer> b1 =

            BufferHubBuffer::create(kTestWidth, kTestHeight, kTestLayerCount, kTestFormat,