From 452e889d74a1a08a4d13235659628120976ab78a Mon Sep 17 00:00:00 2001 From: Jihoon Kim Date: Wed, 8 Feb 2017 16:55:01 +0900 Subject: [PATCH] Fix uninitialized value issue detected by static analysis tool Change-Id: Iecc69b1541cf1feae7ecdbce1f0b9992e33b7ca6 Signed-off-by: Jihoon Kim --- src/MicEffector.cpp | 3 +- src/candidate/efl/candidate-multiline-efl.cpp | 51 +++++++++++++++++++++------ 2 files changed, 42 insertions(+), 12 deletions(-) diff --git a/src/MicEffector.cpp b/src/MicEffector.cpp index 6e1ec2e..38e9c17 100644 --- a/src/MicEffector.cpp +++ b/src/MicEffector.cpp @@ -75,7 +75,8 @@ double cubic_easy_out(double index, double start, double end, double duration) * */ MicEffector::MicEffector(Evas_Object *canvas, Evas_Object *layout, IMicEffector& effect) - : drawcount(0) + : startcount(0) + , drawcount(0) , forcestop(false) , started(false) , fake(false) diff --git a/src/candidate/efl/candidate-multiline-efl.cpp b/src/candidate/efl/candidate-multiline-efl.cpp index 1852970..f2fd06f 100644 --- a/src/candidate/efl/candidate-multiline-efl.cpp +++ b/src/candidate/efl/candidate-multiline-efl.cpp @@ -362,6 +362,15 @@ EflMultiLineCandidate::EflMultiLineCandidate(Evas_Object *window) m_screenHeight = 0; m_screenRatio = 1.0; m_window = window; + m_candidateScrollerBg = NULL; + m_candidateScroller = NULL; + m_candidateTable = NULL; + m_candidateMoreBtn = NULL; + m_candidateCloseBtn = NULL; + m_candidateMoreScrollerBg = NULL; + m_candidateMoreScroller = NULL; + m_candidateMoreTable = NULL; + make_view(); make_more_view(); m_candidateFontName = string("Tizen"); @@ -372,18 +381,38 @@ EflMultiLineCandidate::EflMultiLineCandidate(Evas_Object *window) EflMultiLineCandidate::~EflMultiLineCandidate() { - elm_table_clear(m_candidateTable, EINA_TRUE); - elm_table_clear(m_candidateMoreTable, EINA_TRUE); + if (m_candidateTable) + elm_table_clear(m_candidateTable, EINA_TRUE); + + if (m_candidateMoreTable) + elm_table_clear(m_candidateMoreTable, EINA_TRUE); + + if (m_stringWidthCalObj) + evas_object_del(m_stringWidthCalObj); + + if (m_candidateScrollerBg) + evas_object_del(m_candidateScrollerBg); + + if (m_candidateScroller) + evas_object_del(m_candidateScroller); + + if (m_candidateTable) + evas_object_del(m_candidateTable); + + if (m_candidateMoreBtn) + evas_object_del(m_candidateMoreBtn); + + if (m_candidateCloseBtn) + evas_object_del(m_candidateCloseBtn); + + if (m_candidateMoreScrollerBg) + evas_object_del(m_candidateMoreScrollerBg); + + if (m_candidateMoreScroller) + evas_object_del(m_candidateMoreScroller); - evas_object_del(m_stringWidthCalObj); - evas_object_del(m_candidateScrollerBg); - evas_object_del(m_candidateScroller); - evas_object_del(m_candidateTable); - evas_object_del(m_candidateMoreBtn); - evas_object_del(m_candidateCloseBtn); - evas_object_del(m_candidateMoreScrollerBg); - evas_object_del(m_candidateMoreScroller); - evas_object_del(m_candidateMoreTable); + if (m_candidateMoreTable) + evas_object_del(m_candidateMoreTable); } void -- 2.7.4