OSDN Git Service

Corrected buffer overflow when parsing /proc/wakelocks
authorJohannes Carlsson <johannes.carlsson.x@sonyericsson.com>
Wed, 30 Jun 2010 06:45:55 +0000 (08:45 +0200)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Fri, 5 Aug 2011 08:05:43 +0000 (16:05 +0800)
commit7a1c46e8fd2d8f7d44b805f55a3ffc5d7518a4af
tree0974aab8d37047a9b6e185e0b8ce0e59b996de24
parent0069230207ac1f624fae992d69c0934f7a038b6c
Corrected buffer overflow when parsing /proc/wakelocks

The android_os_Process_parseProcLineArray in android_util_Process.cpp
writes up to buffer[endIndex]. This sometimes caused an assert to be
triggered in NewStringUTF when the output from /proc/wakelocks was
larger than 4096 bytes. The buffer was also increased in order to be
able to parse all wakelocks completely.

Change-Id: Idf8e66d61ad979377569048f59c3eee278b146db
core/java/com/android/internal/os/BatteryStatsImpl.java