diff options
| author | groby@chromium.org <groby@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-22 19:24:51 +0000 |
|---|---|---|
| committer | groby@chromium.org <groby@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-22 19:24:51 +0000 |
| commit | 94325fcae6cd3783276024a02f6ce30daa169597 (patch) | |
| tree | a83153466dfabd77948bae9fef84a68cb5fb42d2 | |
| parent | 2fb7e3bad4942773fe363cf776238a5a9a408f1d (diff) | |
| download | chromium_src-94325fcae6cd3783276024a02f6ce30daa169597.zip chromium_src-94325fcae6cd3783276024a02f6ce30daa169597.tar.gz chromium_src-94325fcae6cd3783276024a02f6ce30daa169597.tar.bz2 | |
Fixed several FORWARD_NULL issues from Coverity. (I.e. variables can be NULL at point of use)
CID=16945,17114
R=jhawkins@chromium.org
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/7211034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90067 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/tabs/tab_strip_model_order_controller.cc | 7 | ||||
| -rw-r--r-- | content/browser/trace_subscriber_stdio.cc | 3 |
2 files changed, 7 insertions, 3 deletions
diff --git a/chrome/browser/tabs/tab_strip_model_order_controller.cc b/chrome/browser/tabs/tab_strip_model_order_controller.cc index d26f97b..75fc341 100644 --- a/chrome/browser/tabs/tab_strip_model_order_controller.cc +++ b/chrome/browser/tabs/tab_strip_model_order_controller.cc @@ -128,9 +128,12 @@ void TabStripModelOrderController::ActiveTabChanged( } NavigationController* new_opener = tabstrip_->GetOpenerOfTabContentsAt(index); + if (user_gesture && new_opener != old_opener && - new_opener != &old_contents->controller() && - old_opener != &new_contents->controller()) { + ((old_contents == NULL && new_opener == NULL) || + new_opener != &old_contents->controller()) && + ((new_contents == NULL && old_opener == NULL) || + old_opener != &new_contents->controller())) { tabstrip_->ForgetAllOpeners(); } } diff --git a/content/browser/trace_subscriber_stdio.cc b/content/browser/trace_subscriber_stdio.cc index 6d4e23b..540f1407 100644 --- a/content/browser/trace_subscriber_stdio.cc +++ b/content/browser/trace_subscriber_stdio.cc @@ -51,6 +51,7 @@ void TraceSubscriberStdio::OnTraceDataCollected( LOG(ERROR) << "Error " << ferror(m_file) << " when writing to trace file"; fclose(m_file); m_file = 0; + } else { + fputc(',', m_file); } - fputc(',', m_file); } |