Merge "Corrected buffer overflow when parsing /proc/wakelocks" (ce3ac5f0) · Commits · e / os / android_frameworks_base

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

+6 −4

Original line number	Diff line number	Diff line
		@@ -844,7 +844,7 @@ public final class BatteryStatsImpl extends BatteryStats {

		private final Map<String, KernelWakelockStats> readKernelWakelockStats() {

		byte[] buffer = new byte[4096];
		byte[] buffer = new byte[8192];
		int len;

		try {
		@@ -891,9 +891,11 @@ public final class BatteryStatsImpl extends BatteryStats {
		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.
		// 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;