From b3b083c883829f3837b95051610c7cb29e98a10e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Fri, 20 Nov 2015 00:11:31 +0200 Subject: [PATCH 1/2] Fully initialize m_sDecParam in TestInitUninit Before dc2cbe4, the DecoderConfigParam function returned early since DecoderSetCsp signaled a failure, which is why the uninitialized parameters weren't read before. This fixes valgrind warnings about conditional jumps depending on uninitialized values. --- test/decoder/DecUT_DecExt.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/test/decoder/DecUT_DecExt.cpp b/test/decoder/DecUT_DecExt.cpp index 0e6af6c2..d54bfa5f 100644 --- a/test/decoder/DecUT_DecExt.cpp +++ b/test/decoder/DecUT_DecExt.cpp @@ -203,6 +203,7 @@ void DecoderInterfaceTest::TestInitUninit() { EXPECT_EQ (eRet, cmInitExpected); } //Initialize first, can get input color format + Init(); m_sDecParam.bParseOnly = false; m_pDec->Initialize (&m_sDecParam); From eaf4798119c7e94cc54710dcadf0fa589aeb3aa1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Fri, 20 Nov 2015 00:16:52 +0200 Subject: [PATCH 2/2] Readd a test for GetOption in TestInitUninit In dc2cbe4, the previous test for GetOption that succeeds when the decoder is initialized was removed. Add a GetOption call for a different option, now that DECODER_OPTION_DATAFORMAT is removed. --- test/decoder/DecUT_DecExt.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/decoder/DecUT_DecExt.cpp b/test/decoder/DecUT_DecExt.cpp index d54bfa5f..706441d8 100644 --- a/test/decoder/DecUT_DecExt.cpp +++ b/test/decoder/DecUT_DecExt.cpp @@ -206,6 +206,9 @@ void DecoderInterfaceTest::TestInitUninit() { Init(); m_sDecParam.bParseOnly = false; m_pDec->Initialize (&m_sDecParam); + eRet = (CM_RETURN) m_pDec->GetOption (DECODER_OPTION_END_OF_STREAM, &iOutput); + EXPECT_EQ (eRet, cmResultSuccess); + EXPECT_EQ (iOutput, 0); //Uninitialize, no GetOption can be done m_pDec->Uninitialize();