summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2012-05-30 19:16:47 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-05-30 19:16:47 -0700
commit1a7d90c42ad682c8f5c6afc8c4975396380918d5 (patch)
treece8abf2b2baf8fb1d6fdc503a63795132ad8326f /services
parentac8ed11db3ccfa4f017bbb20d49c463595e6d90a (diff)
parent7f6519691fdd8062a090de74cfc5d2a906f9e5f6 (diff)
downloadframeworks_base-1a7d90c42ad682c8f5c6afc8c4975396380918d5.zip
frameworks_base-1a7d90c42ad682c8f5c6afc8c4975396380918d5.tar.gz
frameworks_base-1a7d90c42ad682c8f5c6afc8c4975396380918d5.tar.bz2
am 7f651969: Merge "fix a potential buffer overflow in sensorservice" into jb-dev
* commit '7f6519691fdd8062a090de74cfc5d2a906f9e5f6': fix a potential buffer overflow in sensorservice
Diffstat (limited to 'services')
-rw-r--r--services/sensorservice/SensorService.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/sensorservice/SensorService.cpp b/services/sensorservice/SensorService.cpp
index 04ec820..9e5e84b 100644
--- a/services/sensorservice/SensorService.cpp
+++ b/services/sensorservice/SensorService.cpp
@@ -226,7 +226,7 @@ bool SensorService::threadLoop()
ALOGD("nuSensorService thread starting...");
const size_t numEventMax = 16;
- const size_t minBufferSize = numEventMax * mVirtualSensorList.size();
+ const size_t minBufferSize = numEventMax + numEventMax * mVirtualSensorList.size();
sensors_event_t buffer[minBufferSize];
sensors_event_t scratch[minBufferSize];
SensorDevice& device(SensorDevice::getInstance());