diff options
| author | Marcus Fritzsch <marcus.fritzsch@xse.de> | 2014-08-13 10:57:23 +0200 |
|---|---|---|
| committer | Nobuhiko Tanibata <NOBUHIKO_TANIBATA@denso.co.jp> | 2014-09-01 15:55:44 +0900 |
| commit | 777793acee6b2ff6606aa9d1828f9ed447b5c331 (patch) | |
| tree | e8d9448bda091d27b3da225fdfb5c4852d62a4e7 | |
| parent | e442e7bc385f3ded809b76e111b402034bb36e42 (diff) | |
| download | wayland-ivi-extension-777793acee6b2ff6606aa9d1828f9ed447b5c331.tar.gz | |
tests: fixed 2 use-after-free errors
Signed-off-by: Marcus Fritzsch <marcus.fritzsch@xse.de>
| -rw-r--r-- | ivi-layermanagement-api/test/ilm_control_test.cpp | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/ivi-layermanagement-api/test/ilm_control_test.cpp b/ivi-layermanagement-api/test/ilm_control_test.cpp index 324c003..b1217e7 100644 --- a/ivi-layermanagement-api/test/ilm_control_test.cpp +++ b/ivi-layermanagement-api/test/ilm_control_test.cpp @@ -361,31 +361,36 @@ TEST_F(IlmCommandTest, ilm_getScreenResolution_SingleScreen) { t_ilm_uint numberOfScreens = 0; t_ilm_uint* screenIDs = NULL; ASSERT_EQ(ILM_SUCCESS, ilm_getScreenIDs(&numberOfScreens, &screenIDs)); - free(screenIDs); - ASSERT_TRUE(numberOfScreens>0); + EXPECT_TRUE(numberOfScreens>0); + + if (numberOfScreens > 0) + { + uint firstScreen = screenIDs[0]; + t_ilm_uint width = 0, height = 0; + EXPECT_EQ(ILM_SUCCESS, ilm_getScreenResolution(firstScreen, &width, &height)); + EXPECT_GT(width, 0u); + EXPECT_GT(height, 0u); + } - uint firstScreen = screenIDs[0]; - t_ilm_uint width = 0, height = 0; - ASSERT_EQ(ILM_SUCCESS, ilm_getScreenResolution(firstScreen, &width, &height)); - ASSERT_GT(width, 0u); - ASSERT_GT(height, 0u); + free(screenIDs); } TEST_F(IlmCommandTest, ilm_getScreenResolution_MultiScreen) { t_ilm_uint numberOfScreens = 0; t_ilm_uint* screenIDs = NULL; ASSERT_EQ(ILM_SUCCESS, ilm_getScreenIDs(&numberOfScreens, &screenIDs)); - free(screenIDs); - ASSERT_TRUE(numberOfScreens>0); + EXPECT_TRUE(numberOfScreens>0); for (uint screenIndex = 0; screenIndex < numberOfScreens; ++screenIndex) { uint screen = screenIDs[screenIndex]; t_ilm_uint width = 0, height = 0; - ASSERT_EQ(ILM_SUCCESS, ilm_getScreenResolution(screen, &width, &height)); - ASSERT_GT(width, 0u); - ASSERT_GT(height, 0u); + EXPECT_EQ(ILM_SUCCESS, ilm_getScreenResolution(screen, &width, &height)); + EXPECT_GT(width, 0u); + EXPECT_GT(height, 0u); } + + free(screenIDs); } TEST_F(IlmCommandTest, ilm_getLayerIDs) { |