Merge pull request #4739 from asimshankar/tf-bytesize

Graceful failure in SerializeToArray().
7 years ago · 36c5780a3d
parent b40cb4bc8b 2020e3d5ee
commit 36c5780a3d
1 changed files with 5 additions and 1 deletions
--- 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);