summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Hackmann <ghackmann@google.com>2014-04-07 23:32:00 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-04-07 23:32:00 +0000
commit7b6a8cbae956de544f01c43ec0814130aea1f846 (patch)
tree950fb9b9509893f058a435bb2abe4b79190525dd
parent8f2a205f34bfad9eddbd62a073d1ca492276d538 (diff)
parent679e2c252274a7072c65471d6799a962261e1883 (diff)
downloadsystem_core-7b6a8cbae956de544f01c43ec0814130aea1f846.zip
system_core-7b6a8cbae956de544f01c43ec0814130aea1f846.tar.gz
system_core-7b6a8cbae956de544f01c43ec0814130aea1f846.tar.bz2
am 679e2c25: am 9101878d: Merge "logd: fix LogStatistics::format freeing wrong pointer"
* commit '679e2c252274a7072c65471d6799a962261e1883': 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;
}