From 18b924879a4bb1e559a5b4c4309d088d19d34b20 Mon Sep 17 00:00:00 2001
From: "sadrul@chromium.org"
 <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Wed, 18 May 2011 15:01:27 +0000
Subject: 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
---
 views/touchui/touch_factory.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'views')

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();
 }
-- 
cgit v1.1