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

Commit da9ca91f authored by mspector@google.com's avatar mspector@google.com
Browse files

3 uninitialized variables in IOMX.cpp 

Uninitialized MetadataBufferType pointer in case:
SET_INPUT_SURFACE
STORE_META_DATA_IN_BUFFERS
CREATE_INPUT_SURFACE

Fix: initialize them to kMetadataBufferTypeInvalid

Bug: 26324358
Change-Id: Ib3bcac9bedc98bc65efa39f67cdbffbd90b374c9
parent 9094b23c

media/libmedia/IOMX.cpp

+16 −3
Original line number Diff line number Diff line
@@ -844,9 +844,13 @@ status_t BnOMX::onTransact( 
            OMX_U32 port_index = data.readInt32();



            sp<IGraphicBufferProducer> bufferProducer;

            MetadataBufferType type;

            MetadataBufferType type = kMetadataBufferTypeInvalid;

            status_t err = createInputSurface(node, port_index, &bufferProducer, &type);



            if ((err != OK) && (type == kMetadataBufferTypeInvalid)) {

                android_errorWriteLog(0x534e4554, "26324358");

            }



            reply->writeInt32(type);

            reply->writeInt32(err);
@@ -886,9 +890,13 @@ status_t BnOMX::onTransact( 
            sp<IGraphicBufferConsumer> bufferConsumer =

                    interface_cast<IGraphicBufferConsumer>(data.readStrongBinder());



            MetadataBufferType type;

            MetadataBufferType type = kMetadataBufferTypeInvalid;

            status_t err = setInputSurface(node, port_index, bufferConsumer, &type);



            if ((err != OK) && (type == kMetadataBufferTypeInvalid)) {

                android_errorWriteLog(0x534e4554, "26324358");

            }



            reply->writeInt32(type);

            reply->writeInt32(err);

            return NO_ERROR;
@@ -914,8 +922,13 @@ status_t BnOMX::onTransact( 
            OMX_U32 port_index = data.readInt32();

            OMX_BOOL enable = (OMX_BOOL)data.readInt32();



            MetadataBufferType type;

            MetadataBufferType type = kMetadataBufferTypeInvalid;

            status_t err = storeMetaDataInBuffers(node, port_index, enable, &type);



            if ((err != OK) && (type == kMetadataBufferTypeInvalid)) {

                android_errorWriteLog(0x534e4554, "26324358");

            }



            reply->writeInt32(type);

            reply->writeInt32(err);