Merge commit 'remotes/korg/cupcake' into merge

Conflicts:
	init/devices.c
	libpixelflinger/Android.mk

2 files changed, 16 insertions, 8 deletions

diff --git a/liblog/fake_log_device.c b/liblog/fake_log_device.c
index d9d67b4..ed9d699 100644
--- a/liblog/fake_log_device.c
+++ b/liblog/fake_log_device.c
@@ -438,31 +438,38 @@ static void showLog(LogState *state,
         if (*p++ == '\n') numLines++;
     }
     if (p > msg && *(p-1) != '\n') numLines++;
-    
+
     /*
      * Create an array of iovecs large enough to write all of
      * the lines with a prefix and a suffix.
      */
     const size_t INLINE_VECS = 6;
+    const size_t MAX_LINES   = ((size_t)~0)/(3*sizeof(struct iovec*));
     struct iovec stackVec[INLINE_VECS];
     struct iovec* vec = stackVec;
-    
-    numLines *= 3;  // 3 iovecs per line.
-    if (numLines > INLINE_VECS) {
+    size_t numVecs;
+
+    if (numLines > MAX_LINES)
+        numLines = MAX_LINES;
+
+    numVecs = numLines*3;  // 3 iovecs per line.
+    if (numVecs > INLINE_VECS) {
         vec = (struct iovec*)malloc(sizeof(struct iovec)*numLines);
         if (vec == NULL) {
             msg = "LOG: write failed, no memory";
-            numLines = 3;
+            numVecs = 3;
+            numLines = 1;
+            vec = stackVec;
         }
     }
-    
+
     /*
      * Fill in the iovec pointers.
      */
     p = msg;
     struct iovec* v = vec;
     int totalLen = 0;
-    while (p < end) {
+    while (numLines > 0 && p < end) {
         if (prefixLen > 0) {
             v->iov_base = prefixBuf;
             v->iov_len = prefixLen;
@@ -484,6 +491,7 @@ static void showLog(LogState *state,
             totalLen += suffixLen;
             v++;
         }
+        numLines -= 1;
     }
     
     /*
diff --git a/liblog/logd_write.c b/liblog/logd_write.c
index e40d2ce..80867d1 100644
--- a/liblog/logd_write.c
+++ b/liblog/logd_write.c
@@ -25,7 +25,7 @@
 #include <stdlib.h>
 #include <stdarg.h>
 
-#include <utils/logger.h>
+#include <cutils/logger.h>
 #include <cutils/logd.h>
 
 #define LOG_BUF_SIZE	1024