summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrobertshield@google.com <robertshield@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-24 17:05:40 +0000
committerrobertshield@google.com <robertshield@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-24 17:05:40 +0000
commitcf62075e20a12d43c9a9de07411f4c0c1f47336d (patch)
tree01fa3026711a1c2e920e891826d6f2b8c3940dfe
parent50700d1148a21a623b7cd9b9389e82f5127ed66f (diff)
downloadchromium_src-cf62075e20a12d43c9a9de07411f4c0c1f47336d.zip
chromium_src-cf62075e20a12d43c9a9de07411f4c0c1f47336d.tar.gz
chromium_src-cf62075e20a12d43c9a9de07411f4c0c1f47336d.tar.bz2
Adding missing null check in case of missing file version info.
Review URL: http://codereview.chromium.org/88041 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14436 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/automation/automation_provider.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc
index fce3a68..dc77b01 100644
--- a/chrome/browser/automation/automation_provider.cc
+++ b/chrome/browser/automation/automation_provider.cc
@@ -809,7 +809,10 @@ void AutomationProvider::ConnectToChannel(const std::wstring& channel_id) {
true, g_browser_process->shutdown_event()));
scoped_ptr<FileVersionInfo> file_version_info(
FileVersionInfo::CreateFileVersionInfoForCurrentModule());
- std::string version_string(WideToASCII(file_version_info->file_version()));
+ std::string version_string;
+ if (file_version_info != NULL) {
+ version_string = WideToASCII(file_version_info->file_version());
+ }
// Send a hello message with our current automation protocol version.
channel_->Send(new AutomationMsg_Hello(0, version_string.c_str()));