commit ce3ac5f02970fcab91e16ecb573931d209b1985c
author Romain Guy <romainguy@android.com> Thu Jul 29 14:00:48 2010 -0700
committer Android Code Review <code-review@android.com> Thu Jul 29 14:00:48 2010 -0700
tree 570c56bbf0adfe9e95d7fb4cb16bbc57723cab41
parent e53fe4a465a014788e3b93ca9f30f229481bc4e5
parent 3372f2e259247810627fd22033406163284f4f64

Merge "Corrected buffer overflow when parsing /proc/wakelocks"

core/java/com/android/internal/os/BatteryStatsImpl.java

diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java
index aadb576..167e45d 100644
--- a/core/java/com/android/internal/os/BatteryStatsImpl.java
+++ b/core/java/com/android/internal/os/BatteryStatsImpl.java
@@ -844,7 +844,7 @@
     
     private final Map<String, KernelWakelockStats> readKernelWakelockStats() {
         
-        byte[] buffer = new byte[4096];
+        byte[] buffer = new byte[8192];
         int len;
         
         try {
@@ -891,9 +891,11 @@
                 for (endIndex=startIndex; 
                         endIndex < len && wlBuffer[endIndex] != '\n' && wlBuffer[endIndex] != '\0'; 
                         endIndex++);
-                // Don't go over the end of the buffer
-                if (endIndex < len) {
-                    endIndex++; // endIndex is an exclusive upper bound.
+                endIndex++; // endIndex is an exclusive upper bound.
+                // Don't go over the end of the buffer, Process.parseProcLine might
+                // write to wlBuffer[endIndex]
+                if (endIndex >= (len - 1) ) {
+                    return m;
                 }
 
                 String[] nameStringArray = mProcWakelocksName;