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