Merge pull request #4739 from asimshankar/tf-bytesize

Graceful failure in SerializeToArray().

Merge pull request #4739 from asimshankar/tf-bytesize
Graceful failure in SerializeToArray().
36c5780a · Feng Xiao · GitHub · b40cb4bc · 2020e3d5 · 36c5780a
Unverified Commit 36c5780a authored Jun 18, 2018 by Feng Xiao Committed by GitHub Jun 18, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

message_lite.cc src/google/protobuf/message_lite.cc +5 -1

No files found.
--- a/src/google/protobuf/message_lite.cc
+++ b/src/google/protobuf/message_lite.cc
@@ -316,7 +316,11 @@ bool MessageLite::SerializeToArray(void* data, int size) const {
 }

 bool MessageLite::SerializePartialToArray(void* data, int size) const {
-  int byte_size = ByteSizeLong();
+  size_t byte_size = ByteSizeLong();
+  if (byte_size > INT_MAX) {
+    GOOGLE_LOG(ERROR) << "Exceeded maximum protobuf size of 2GB: " << size;
+    return false;
+  }
  if (size < byte_size) return false;
  uint8* start = reinterpret_cast<uint8*>(data);
  uint8* end = SerializeWithCachedSizesToArray(start);