From 33d3c05c9316a96b2d11069ca091df08d55baf5a Mon Sep 17 00:00:00 2001 From: "mattm@chromium.org" <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Date: Fri, 18 Sep 2009 21:07:19 +0000 Subject: [PATCH] Fix check for wr_list validity not covering entire use. (Coverity FORWARD_NULL error CID 6043.) BUG=17101 TEST=none Review URL: http://codereview.chromium.org/209038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26607 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/dom_ui/tips_handler.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/chrome/browser/dom_ui/tips_handler.cc b/chrome/browser/dom_ui/tips_handler.cc index be9ffbad4bff3..06f73f3e07ab4 100644 --- a/chrome/browser/dom_ui/tips_handler.cc +++ b/chrome/browser/dom_ui/tips_handler.cc @@ -54,8 +54,8 @@ void TipsHandler::HandleGetTips(const Value* content) { if (tips_cache_->GetInteger( WebResourceService::kCurrentTipPrefName, ¤t_tip_index) && tips_cache_->GetList( - WebResourceService::kTipCachePrefName, &wr_list)) { - if (wr_list && wr_list->GetSize() > 0) + WebResourceService::kTipCachePrefName, &wr_list) && + wr_list && wr_list->GetSize() > 0) { if (wr_list->GetSize() <= static_cast<size_t>(current_tip_index)) current_tip_index = 0; if (wr_list->GetString(current_tip_index, ¤t_tip)) { @@ -84,4 +84,3 @@ bool TipsHandler::IsValidURL(const std::wstring& url_string) { return !url.is_empty() && (url.SchemeIs(chrome::kHttpScheme) || url.SchemeIs(chrome::kHttpsScheme)); } - -- GitLab