diff options
| author | Mathias Agopian <mathias@google.com> | 2012-05-30 19:11:33 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-30 19:11:33 -0700 |
| commit | 7f6519691fdd8062a090de74cfc5d2a906f9e5f6 (patch) | |
| tree | 2badef8f79ed1159b3dcf4d68300aa029b955197 | |
| parent | 28795d883a34f5393ff00dca0a54aca79b2607d5 (diff) | |
| parent | acd31516c6d4db2816727443582f225e21be501c (diff) | |
| download | frameworks_base-7f6519691fdd8062a090de74cfc5d2a906f9e5f6.zip frameworks_base-7f6519691fdd8062a090de74cfc5d2a906f9e5f6.tar.gz frameworks_base-7f6519691fdd8062a090de74cfc5d2a906f9e5f6.tar.bz2 | |
Merge "fix a potential buffer overflow in sensorservice" into jb-dev
| -rw-r--r-- | services/sensorservice/SensorService.cpp | 2 |
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()); |