Commit: 6866f143bf855d796887b2f8ee8752f09a7516d6 - system-coremmmm (git)

system/corennnnn

Commit MetaInfo

• Revision: 6866f143bf855d796887b2f8ee8752f09a7516d6 (tree)
• Time: 2016-09-30 07:51:44
• Author: Linux Build Service Account <lnxbuild@loca...>
• Commiter: Gerrit - the friendly Code Review server

Log Message

Merge "Fix a memory leak in logcat binary"

Change Summary

• modified: logcat/logcat.cpp

Incremental Difference

--- a/logcat/logcat.cpp
+++ b/logcat/logcat.cpp
@@ -169,10 +169,17 @@ static void writeEntryToLogDump(AndroidLogEntry *entry)
 {
     int bytesWrittenToLogDump = 0;
     char defaultBuffer[512];
+    char *outBuffer = NULL;
     size_t logLength;
 
     // Get logLength
-    android_log_formatLogLine(g_logformat, defaultBuffer,sizeof(defaultBuffer), entry, &logLength);
+    outBuffer = android_log_formatLogLine(g_logformat, defaultBuffer,
+                                          sizeof(defaultBuffer),
+                                          entry,
+                                          &logLength);
+    if (outBuffer != defaultBuffer) {
+        free(outBuffer);
+    }
 
     // Check if the to-be-inserted log exceeds the available buffer size; And rotate if needed.
     checkAndRotateLogDump(logLength);