summaryrefslogtreecommitdiffstats
path: root/libs
diff options
context:
space:
mode:
authorMichael Lentine <mlentine@google.com>2014-10-31 22:58:19 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-31 22:58:19 +0000
commit078794ed377e7080ee155a632482bb98f1c9ade7 (patch)
tree6132c5347ec4b8d9ac71a8b69cd2cfe2ca588493 /libs
parentb43a1c9be2046345d61fb0d0a5fd06eda5cbe31e (diff)
parent9853685931298ba02066ebb50a8377ad4aa80f00 (diff)
downloadframeworks_native-078794ed377e7080ee155a632482bb98f1c9ade7.zip
frameworks_native-078794ed377e7080ee155a632482bb98f1c9ade7.tar.gz
frameworks_native-078794ed377e7080ee155a632482bb98f1c9ade7.tar.bz2
am 98536859: Merge "Fix output of pointers for 64bit devices." into lmp-mr1-dev
* commit '9853685931298ba02066ebb50a8377ad4aa80f00': Fix output of pointers for 64bit devices.
Diffstat (limited to 'libs')
-rw-r--r--libs/binder/TextOutput.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/binder/TextOutput.cpp b/libs/binder/TextOutput.cpp
index db3e858..2ed5188 100644
--- a/libs/binder/TextOutput.cpp
+++ b/libs/binder/TextOutput.cpp
@@ -116,8 +116,8 @@ TextOutput& operator<<(TextOutput& to, double val)
TextOutput& operator<<(TextOutput& to, const void* val)
{
- char buf[16];
- sprintf(buf, "%p", val);
+ char buf[32];
+ snprintf(buf, sizeof(buf), "%p", val);
to.print(buf, strlen(buf));
return to;
}