summaryrefslogtreecommitdiff
path: root/libs/binder/Parcel.cpp
diff options
context:
space:
mode:
author Steven Moreland <smoreland@google.com> 2019-09-17 15:37:04 -0700
committer android-build-merger <android-build-merger@google.com> 2019-09-17 15:37:04 -0700
commit8ea008771ef5994ef735645d2afab0465da9aeec (patch)
tree4557b2d0bc82ed5c775634fad8437d0c3477d2b7 /libs/binder/Parcel.cpp
parent800f31efbdc5e38d6f54a401e068902f609b8ef1 (diff)
parent68ff4b6e913e4c7dcc2debb969da6be1297b82b7 (diff)
Merge "libbinder: on host" am: a8cb8d7624 am: 240e58191c am: 07bc79d333
am: 68ff4b6e91 Change-Id: I2ab4aea327a0ecd8840699fe68c4fd2df9ff2a4c
Diffstat (limited to 'libs/binder/Parcel.cpp')
-rw-r--r--libs/binder/Parcel.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp
index 3a7a7a9c3f..2a75619056 100644
--- a/libs/binder/Parcel.cpp
+++ b/libs/binder/Parcel.cpp
@@ -67,7 +67,7 @@
#define PAD_SIZE_UNSAFE(s) (((s)+3)&~3)
static size_t pad_size(size_t s) {
- if (s > (SIZE_T_MAX - 3)) {
+ if (s > (std::numeric_limits<size_t>::max() - 3)) {
abort();
}
return PAD_SIZE_UNSAFE(s);