diff options
| author | dkegel@google.com <dkegel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-29 23:44:36 +0000 |
|---|---|---|
| committer | dkegel@google.com <dkegel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-29 23:44:36 +0000 |
| commit | c100dbdfdc5dee985a28125adce2b245a6a210ad (patch) | |
| tree | 9c75bba2f62e286bbb31a23e235273da9fe9398c | |
| parent | 4ace37b1e52fecf91cda2569213c6e739a31d577 (diff) | |
| download | chromium_src-c100dbdfdc5dee985a28125adce2b245a6a210ad.zip chromium_src-c100dbdfdc5dee985a28125adce2b245a6a210ad.tar.gz chromium_src-c100dbdfdc5dee985a28125adce2b245a6a210ad.tar.bz2 | |
Avoid invalid read reported by valgrind, http://crbug.com/11132,
when tab->GetActiveEntry() is NULL.
Review URL: http://codereview.chromium.org/100172
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14913 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/automation/automation_provider.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc index dc77b01..67e4548 100644 --- a/chrome/browser/automation/automation_provider.cc +++ b/chrome/browser/automation/automation_provider.cc @@ -1747,7 +1747,12 @@ void AutomationProvider::GetTabTitle(int handle, int* title_string_size, *title_string_size = -1; // -1 is the error code if (tab_tracker_->ContainsHandle(handle)) { NavigationController* tab = tab_tracker_->GetResource(handle); - *title = UTF16ToWideHack(tab->GetActiveEntry()->title()); + NavigationEntry* entry = tab->GetActiveEntry(); + if (entry != NULL) { + *title = UTF16ToWideHack(entry->title()); + } else { + *title = std::wstring(); + } *title_string_size = static_cast<int>(title->size()); } } |