commit d0e7e8012e19ac750e7858756247be1036da32c4
author Eric Laurent <elaurent@google.com> Mon Jan 27 17:10:34 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jan 27 17:10:34 2014 +0000
tree dc68f714fc4ecb87102ca9d52a29346be7bd60b4
parent 96a7b5a9c87ec3f8cadad5bffc06a82f9f4d86d8
parent 6d39eb9d7da2ca8eb733f2d2eba686c56b24885b

Merge "Do partial reads in MemoryLeakTrackUtil"

media/libmedia/MemoryLeakTrackUtil.cpp

diff --git a/media/libmedia/MemoryLeakTrackUtil.cpp b/media/libmedia/MemoryLeakTrackUtil.cpp
index 6a108ae..f004ca4 100644
--- a/media/libmedia/MemoryLeakTrackUtil.cpp
+++ b/media/libmedia/MemoryLeakTrackUtil.cpp
@@ -49,7 +49,7 @@
     }
 
     void append(const char *s) {
-        strcat(mPtr, s);
+        strncat(mPtr, s, MAX_SIZE - size() - 1);
     }
 
     const char *string() const {
@@ -60,6 +60,10 @@
         return strlen(mPtr);
     }
 
+    void clear() {
+        *mPtr = '\0';
+    }
+
 private:
     char *mPtr;
 
@@ -139,6 +143,9 @@
             }
         } while (moved);
 
+        write(fd, result.string(), result.size());
+        result.clear();
+
         for (size_t i = 0; i < count; i++) {
             AllocEntry *e = &entries[i];
 
@@ -152,13 +159,14 @@
                 result.append(buffer);
             }
             result.append("\n");
+
+            write(fd, result.string(), result.size());
+            result.clear();
         }
 
         delete[] entries;
         free_malloc_leak_info(info);
     }
-
-    write(fd, result.string(), result.size());
 }
 
 #else