summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorsatorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-28 23:12:06 +0000
committersatorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-28 23:12:06 +0000
commit5a530372e52d8892d53153a1db4f8e0a804b8c05 (patch)
tree29ada65b446ea07a82d2d8bd2b5e8af23e5bfce5 /chrome
parent5ccccb46a84a3824a0b9ebae02eb09ffdc64e558 (diff)
downloadchromium_src-5a530372e52d8892d53153a1db4f8e0a804b8c05.zip
chromium_src-5a530372e52d8892d53153a1db4f8e0a804b8c05.tar.gz
chromium_src-5a530372e52d8892d53153a1db4f8e0a804b8c05.tar.bz2
chromeos: Fix a crash in chromeos::PowerManagerClientImpl::OnGetIdleTime().
|response| should be checked as it can be NULL. BUG=chromium-os:23482 TEST=the crash shoud be gone Review URL: http://codereview.chromium.org/8659010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111807 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/chromeos/dbus/power_manager_client.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/browser/chromeos/dbus/power_manager_client.cc b/chrome/browser/chromeos/dbus/power_manager_client.cc
index fce1c13..476a301 100644
--- a/chrome/browser/chromeos/dbus/power_manager_client.cc
+++ b/chrome/browser/chromeos/dbus/power_manager_client.cc
@@ -272,6 +272,10 @@ class PowerManagerClientImpl : public PowerManagerClient {
void OnGetIdleTime(const CalculateIdleTimeCallback& callback,
dbus::Response* response) {
+ if (!response) {
+ LOG(ERROR) << "Error calling " << power_manager::kGetIdleTime;
+ return;
+ }
dbus::MessageReader reader(response);
int64 idle_time_ms = 0;
if (!reader.PopInt64(&idle_time_ms)) {