diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-18 15:01:27 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-18 15:01:27 +0000 |
| commit | 18b924879a4bb1e559a5b4c4309d088d19d34b20 (patch) | |
| tree | b183f8725e60a7daa30f17143e321ff4d2211692 /views/touchui | |
| parent | ddb8505095f8aa6a76a938c5c0019b0c537b8e94 (diff) | |
| download | chromium_src-18b924879a4bb1e559a5b4c4309d088d19d34b20.zip chromium_src-18b924879a4bb1e559a5b4c4309d088d19d34b20.tar.gz chromium_src-18b924879a4bb1e559a5b4c4309d088d19d34b20.tar.bz2 | |
Fix a crash when list of devices is NULL (e.g. over VNC/NX sessions).
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/7044003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85763 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/touchui')
| -rw-r--r-- | views/touchui/touch_factory.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/views/touchui/touch_factory.cc b/views/touchui/touch_factory.cc index dcf88c8..3bf0273 100644 --- a/views/touchui/touch_factory.cc +++ b/views/touchui/touch_factory.cc @@ -210,7 +210,8 @@ void TouchFactory::UpdateDeviceList(Display* display) { pointer_device_lookup_[devinfo->deviceid] = true; } } - XIFreeDeviceInfo(devices); + if (devices) + XIFreeDeviceInfo(devices); SetupValuator(); } |