summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Hackmann <ghackmann@google.com>2014-04-07 23:37:57 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-04-07 23:37:57 +0000
commit2be33e08e96d4cb5bc9207c633dba707a4d5628a (patch)
treee9e1df4e1c38d184a327f7c216124f9afbffa5c5
parent241d5aa3d2891c7161ed0b685426046a8a695b83 (diff)
parent7b6a8cbae956de544f01c43ec0814130aea1f846 (diff)
downloadsystem_core-2be33e08e96d4cb5bc9207c633dba707a4d5628a.zip
system_core-2be33e08e96d4cb5bc9207c633dba707a4d5628a.tar.gz
system_core-2be33e08e96d4cb5bc9207c633dba707a4d5628a.tar.bz2
am 7b6a8cba: am 679e2c25: am 9101878d: Merge "logd: fix LogStatistics::format freeing wrong pointer"
* commit '7b6a8cbae956de544f01c43ec0814130aea1f846': logd: fix LogStatistics::format freeing wrong pointer
-rw-r--r--logd/LogStatistics.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/logd/LogStatistics.cpp b/logd/LogStatistics.cpp
index 82a3a90..fc6e6b2 100644
--- a/logd/LogStatistics.cpp
+++ b/logd/LogStatistics.cpp
@@ -446,7 +446,7 @@ void LogStatistics::format(char **buf,
static const unsigned short spaces_total = 19;
if (*buf) {
- free(buf);
+ free(*buf);
*buf = NULL;
}