summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarl Shapiro <cshapiro@google.com>2010-08-18 13:38:04 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-18 13:38:04 -0700
commit703c85c69d3822067623a6dd7bfde4b734c7f84f (patch)
treea834e64ccf78a89ae986d763b25e9a9b9dadf476
parent58b64acef07e6426914a8cb2d972778fbe138655 (diff)
parent0c0f68e8ff9fb88eaae614d1da316f0037484886 (diff)
downloadsystem_core-703c85c69d3822067623a6dd7bfde4b734c7f84f.zip
system_core-703c85c69d3822067623a6dd7bfde4b734c7f84f.tar.gz
system_core-703c85c69d3822067623a6dd7bfde4b734c7f84f.tar.bz2
am 0c0f68e8: Fix a long standing bug in the output buffer size computation.
Merge commit '0c0f68e8ff9fb88eaae614d1da316f0037484886' into gingerbread-plus-aosp * commit '0c0f68e8ff9fb88eaae614d1da316f0037484886': Fix a long standing bug in the output buffer size computation.
-rw-r--r--liblog/fake_log_device.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/liblog/fake_log_device.c b/liblog/fake_log_device.c
index ed9d699..f8b7254 100644
--- a/liblog/fake_log_device.c
+++ b/liblog/fake_log_device.c
@@ -454,7 +454,7 @@ static void showLog(LogState *state,
numVecs = numLines*3; // 3 iovecs per line.
if (numVecs > INLINE_VECS) {
- vec = (struct iovec*)malloc(sizeof(struct iovec)*numLines);
+ vec = (struct iovec*)malloc(sizeof(struct iovec)*numVecs);
if (vec == NULL) {
msg = "LOG: write failed, no memory";
numVecs = 3;