From 4ba35edbb3b3cb1b4f019312feb3edd5b6a4c10d Mon Sep 17 00:00:00 2001 From: Seoyeon Kim Date: Tue, 23 May 2017 14:37:28 +0900 Subject: [PATCH] Avoid Svace DEREF_OF_NULL warnings - Return values can be dereferenced at window-impl-ecore-wl.cpp and font-client-plugin-impl.cpp Change-Id: Ib5cab8ccc02b31982702e56cb5e3f6b3013a8d67 Signed-off-by: Seoyeon Kim --- adaptors/ecore/wayland/window-impl-ecore-wl.cpp | 21 ++++++++++++--------- .../text-abstraction/font-client-plugin-impl.cpp | 12 ++++++++---- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/adaptors/ecore/wayland/window-impl-ecore-wl.cpp b/adaptors/ecore/wayland/window-impl-ecore-wl.cpp index 51cb650..18e4c8d 100644 --- a/adaptors/ecore/wayland/window-impl-ecore-wl.cpp +++ b/adaptors/ecore/wayland/window-impl-ecore-wl.cpp @@ -101,19 +101,22 @@ struct Window::EventHandler mDisplay = ecore_wl_display_get(); - wl_display* displayWrapper = static_cast< wl_display* >( wl_proxy_create_wrapper( mDisplay ) ); - if( displayWrapper ) + if( mDisplay ) { - mEventQueue = wl_display_create_queue( mDisplay ); - if( mEventQueue ) + wl_display* displayWrapper = static_cast< wl_display* >( wl_proxy_create_wrapper( mDisplay ) ); + if( displayWrapper ) { - wl_proxy_set_queue( reinterpret_cast< wl_proxy* >( displayWrapper ), mEventQueue ); + mEventQueue = wl_display_create_queue( mDisplay ); + if( mEventQueue ) + { + wl_proxy_set_queue( reinterpret_cast< wl_proxy* >( displayWrapper ), mEventQueue ); - wl_registry* registry = wl_display_get_registry( displayWrapper ); - wl_registry_add_listener( registry, &mRegistryListener, this ); - } + wl_registry* registry = wl_display_get_registry( displayWrapper ); + wl_registry_add_listener( registry, &mRegistryListener, this ); + } - wl_proxy_wrapper_destroy( displayWrapper ); + wl_proxy_wrapper_destroy( displayWrapper ); + } } } diff --git a/text/dali/internal/text-abstraction/font-client-plugin-impl.cpp b/text/dali/internal/text-abstraction/font-client-plugin-impl.cpp index dc09c0e..970f0ff 100644 --- a/text/dali/internal/text-abstraction/font-client-plugin-impl.cpp +++ b/text/dali/internal/text-abstraction/font-client-plugin-impl.cpp @@ -340,11 +340,15 @@ void FontClient::Plugin::GetDefaultPlatformFontDescription( FontDescription& fon FcInitReinitialize(); // FcInitBringUptoDate did not seem to reload config file as was still getting old default font. FcPattern* matchPattern = FcPatternCreate(); - FcConfigSubstitute(NULL, matchPattern, FcMatchPattern); - FcDefaultSubstitute( matchPattern ); - MatchFontDescriptionToPattern( matchPattern, mDefaultFontDescription ); - FcPatternDestroy( matchPattern ); + if( matchPattern ) + { + FcConfigSubstitute( NULL, matchPattern, FcMatchPattern ); + FcDefaultSubstitute( matchPattern ); + + MatchFontDescriptionToPattern( matchPattern, mDefaultFontDescription ); + FcPatternDestroy( matchPattern ); + } mDefaultFontDescriptionCached = true; } -- 2.7.4