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

Commit 34fe38b0 authored by Robert Carr's avatar Robert Carr Committed by Rob Carr
Browse files

DO NOT MERGE: SurfaceControl: Ensure unused fields are zeroed 

Otherwise we could leak uninitialized memory to
an untrusted process.

Bug: 214999987
Test: Existing tests pass
Change-Id: I87993fbb920b3af938a311e6afc15383d571823a
(cherry picked from commit c2cf02c1)
parent f2a0e262

libs/gui/SurfaceControl.cpp

+1 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ SurfaceControl::SurfaceControl(const sp<SurfaceControl>& other) { 
    mLayerId = other->mLayerId;

    mWidth = other->mWidth;

    mHeight = other->mHeight;

    mFormat = other->mFormat;

    mCreateFlags = other->mCreateFlags;

}

libs/gui/include/gui/SurfaceControl.h

+6 −6
Original line number Diff line number Diff line
@@ -118,12 +118,12 @@ private: 
    mutable sp<Surface>         mSurfaceData;

    mutable sp<BLASTBufferQueue> mBbq;

    mutable sp<SurfaceControl> mBbqChild;

    int32_t mLayerId;

    uint32_t mTransformHint;

    uint32_t mWidth;

    uint32_t mHeight;

    PixelFormat mFormat;

    uint32_t mCreateFlags;

    int32_t mLayerId = 0;

    uint32_t mTransformHint = 0;

    uint32_t mWidth = 0;

    uint32_t mHeight = 0;

    PixelFormat mFormat = PIXEL_FORMAT_NONE;

    uint32_t mCreateFlags = 0;

};



}; // namespace android