From f278a81cc80035e190dc2132661c88d499779751 Mon Sep 17 00:00:00 2001 From: Ayush Kumar Date: Thu, 16 Mar 2023 15:58:59 +0530 Subject: [PATCH] Fix critical SVACE issue This patch fixes some critical SVACE issues. Change-Id: I2416406a949794838d09dfe0d073a2cd8212d0f9 Signed-off-by: Ayush Kumar --- .../content/browser/media/tizen_renderer_impl.h | 16 ++++++++-------- .../content/browser/select_picker/select_picker_base.h | 4 ++-- .../browser/web_contents/web_contents_impl_efl.cc | 3 +++ .../renderer/media/tizen/media_player_renderer_client.h | 2 +- .../media/base/tizen/media_player_bridge_capi.h | 1 - 5 files changed, 14 insertions(+), 12 deletions(-) diff --git a/tizen_src/chromium_impl/content/browser/media/tizen_renderer_impl.h b/tizen_src/chromium_impl/content/browser/media/tizen_renderer_impl.h index 1dcfe0f..fe6dc06 100644 --- a/tizen_src/chromium_impl/content/browser/media/tizen_renderer_impl.h +++ b/tizen_src/chromium_impl/content/browser/media/tizen_renderer_impl.h @@ -147,9 +147,9 @@ class CONTENT_EXPORT TizenRendererImpl void OnResourceConflict(); void OnRequestSeek(base::TimeDelta time); - media::RendererClient* client_; + media::RendererClient* client_ = nullptr; - State state_; + State state_ = STATE_UNINITIALIZED; // Task runner used to execute pipeline tasks. scoped_refptr task_runner_; @@ -168,9 +168,9 @@ class CONTENT_EXPORT TizenRendererImpl std::unique_ptr audio_renderer_client_; std::unique_ptr video_renderer_client_; - media::MediaResource* media_resource_; - media::DemuxerStream* audio_stream_; - media::DemuxerStream* video_stream_; + media::MediaResource* media_resource_ = nullptr; + media::DemuxerStream* audio_stream_ = nullptr; + media::DemuxerStream* video_stream_ = nullptr; std::unique_ptr media_player_; double volume_ = kDefaultVolume; @@ -179,15 +179,15 @@ class CONTENT_EXPORT TizenRendererImpl // The time to start playback from after starting/seeking has completed. base::TimeDelta start_time_; - media::BufferingState audio_buffering_state_; - media::BufferingState video_buffering_state_; + media::BufferingState audio_buffering_state_ = media::BUFFERING_HAVE_NOTHING; + media::BufferingState video_buffering_state_ = media::BUFFERING_HAVE_NOTHING; // Whether we've received the audio/video ended events. bool media_ended_ = false; bool web_contents_muted_ = false; mojo::Receiver renderer_extension_receiver_; raw_ptr - web_contents_observer_; + web_contents_observer_ = nullptr; // Indicates if a serious error has been encountered by the |media_player_|. bool has_error_ = false; diff --git a/tizen_src/chromium_impl/content/browser/select_picker/select_picker_base.h b/tizen_src/chromium_impl/content/browser/select_picker/select_picker_base.h index 0900cbe..b910c88 100644 --- a/tizen_src/chromium_impl/content/browser/select_picker/select_picker_base.h +++ b/tizen_src/chromium_impl/content/browser/select_picker/select_picker_base.h @@ -68,7 +68,7 @@ class SelectPickerBase { Evas_Object* window_; int selected_index_; bool is_multiple_selection_; - Elm_Genlist_Item_Class* item_class_; + Elm_Genlist_Item_Class* item_class_ = nullptr; private: static void ItemSelectedCallback(void*, Evas_Object*, void*); @@ -77,7 +77,7 @@ class SelectPickerBase { void DestroyPopupList(); - Elm_Genlist_Item_Class* group_class_; + Elm_Genlist_Item_Class* group_class_ = nullptr; std::vector select_picker_data_; std::vector selected_indexes_; }; diff --git a/tizen_src/chromium_impl/content/browser/web_contents/web_contents_impl_efl.cc b/tizen_src/chromium_impl/content/browser/web_contents/web_contents_impl_efl.cc index 95c65e5..b122681 100644 --- a/tizen_src/chromium_impl/content/browser/web_contents/web_contents_impl_efl.cc +++ b/tizen_src/chromium_impl/content/browser/web_contents/web_contents_impl_efl.cc @@ -147,6 +147,9 @@ FrameTree* WebContentsImplEfl::CreateNewWindow( // Added for EFL implementation of WebContentsImpl. In non EFL version // contents of HandleNewWebContentsCreate would come here. std::move(callback).Run(nullptr); + if (!new_contents) + return nullptr; + return &(static_cast(new_contents)->GetPrimaryFrameTree()); } diff --git a/tizen_src/chromium_impl/content/renderer/media/tizen/media_player_renderer_client.h b/tizen_src/chromium_impl/content/renderer/media/tizen/media_player_renderer_client.h index e2933d0..ddae1f9 100644 --- a/tizen_src/chromium_impl/content/renderer/media/tizen/media_player_renderer_client.h +++ b/tizen_src/chromium_impl/content/renderer/media/tizen/media_player_renderer_client.h @@ -96,7 +96,7 @@ class CONTENT_EXPORT MediaPlayerRendererClient // The underlying type should always be a MediaUrlDemuxer, but we only use // methods from the MediaResource interface. - media::MediaResource* media_resource_; + media::MediaResource* media_resource_ = nullptr; media::RendererClient* client_; diff --git a/tizen_src/chromium_impl/media/base/tizen/media_player_bridge_capi.h b/tizen_src/chromium_impl/media/base/tizen/media_player_bridge_capi.h index 9de40a4..c2f7d38 100644 --- a/tizen_src/chromium_impl/media/base/tizen/media_player_bridge_capi.h +++ b/tizen_src/chromium_impl/media/base/tizen/media_player_bridge_capi.h @@ -106,7 +106,6 @@ class MEDIA_EXPORT MediaPlayerBridgeCapi : public MediaPlayerEfl { bool is_paused_; bool is_seeking_; bool is_play_pending_; - bool is_player_released_; bool is_initialized_; bool is_set_playback_rate_delayed_; -- 2.7.4