Fix svace issue in tizen-web-engine-chromium 40/252540/1
authorJiyun Yang <ji.yang@samsung.com>
Fri, 29 Jan 2021 07:04:05 +0000 (16:04 +0900)
committerJiyun Yang <ji.yang@samsung.com>
Fri, 29 Jan 2021 07:04:05 +0000 (16:04 +0900)
Change-Id: Ifa94987a189d5c428274412d51bfa12d8db46995
Signed-off-by: Jiyun Yang <ji.yang@samsung.com>
dali-extension/web-engine-chromium/tizen-web-engine-chromium.cpp

index 08b8810..da70860 100755 (executable)
@@ -858,38 +858,54 @@ void TizenWebEngineChromium::SetUserAgent( const std::string& userAgent )
 
 Dali::WebEngineSettings& TizenWebEngineChromium::GetSettings() const
 {
-  if( !mWebViewContainer )
+  if( mWebViewContainer )
   {
-    DALI_LOG_ERROR( "Web engine is not created successfully!" );
+    return mWebViewContainer->GetSettings();
   }
-  return mWebViewContainer->GetSettings();
+
+  DALI_LOG_ERROR( "Web engine is not created successfully!" );
+  static TizenWebEngineSettings dummy( nullptr );
+
+  return dummy;
 }
 
 Dali::WebEngineContext& TizenWebEngineChromium::GetContext() const
 {
-  if( !mWebViewContainer )
+  if( mWebViewContainer )
   {
-    DALI_LOG_ERROR( "Web engine is not created successfully!" );
+    return mWebViewContainer->GetContext();
   }
-  return mWebViewContainer->GetContext();
+
+  DALI_LOG_ERROR( "Web engine is not created successfully!" );
+  static TizenWebEngineContext dummy( nullptr );
+
+  return dummy;
 }
 
 Dali::WebEngineCookieManager& TizenWebEngineChromium::GetCookieManager() const
 {
-  if( !mWebViewContainer )
+  if( mWebViewContainer )
   {
-    DALI_LOG_ERROR( "Web engine is not created successfully!" );
+    return mWebViewContainer->GetCookieManager();
   }
-  return mWebViewContainer->GetCookieManager();
+
+  DALI_LOG_ERROR( "Web engine is not created successfully!" );
+  static TizenWebEngineCookieManager dummy( nullptr );
+
+  return dummy;
 }
 
 Dali::WebEngineBackForwardList& TizenWebEngineChromium::GetBackForwardList() const
 {
-  if( !mWebViewContainer )
+  if( mWebViewContainer )
   {
-    DALI_LOG_ERROR( "Web engine is not created successfully!" );
+    return mWebViewContainer->GetBackForwardList();
   }
-  return mWebViewContainer->GetBackForwardList();
+
+  DALI_LOG_ERROR( "Web engine is not created successfully!" );
+  static TizenWebEngineBackForwardList dummy( nullptr );
+
+  return dummy;
 }
 
 void TizenWebEngineChromium::SetSize( int width, int height )