Improve error messaging when detecting and erroring out on integer overflow of byte count limit variables.

PiperOrigin-RevId: 728362523

Author: 12wrigja

java/core/src/main/java/com/google/protobuf/CodedInputStream.java

@@ -1184,7 +1184,8 @@ public int pushLimit(int byteLimit) throws InvalidProtocolBufferException {
       }
       byteLimit += getTotalBytesRead();
       if (byteLimit < 0) {
-        throw InvalidProtocolBufferException.parseFailure();
+        // Check for for integer overflow in byteLimit
+        throw InvalidProtocolBufferException.sizeLimitExceeded();
       }
       final int oldLimit = currentLimit;
       if (byteLimit > oldLimit) {
@@ -2679,7 +2680,8 @@ public int pushLimit(int byteLimit) throws InvalidProtocolBufferException {
       }
       byteLimit += totalBytesRetired + pos;
       if (byteLimit < 0) {
-        throw InvalidProtocolBufferException.parseFailure();
+        // Check for for integer overflow in byteLimit
+        throw InvalidProtocolBufferException.sizeLimitExceeded();
       }
       final int oldLimit = currentLimit;
       if (byteLimit > oldLimit) {

java/core/src/main/java/com/google/protobuf/InvalidProtocolBufferException.java

@@ -137,8 +137,9 @@ static InvalidProtocolBufferException recursionLimitExceeded() {
 
   static InvalidProtocolBufferException sizeLimitExceeded() {
     return new InvalidProtocolBufferException(
-        "Protocol message was too large.  May be malicious.  "
-            + "Use CodedInputStream.setSizeLimit() to increase the size limit.");
+        "Protocol message was too large.  May be malicious.  Use CodedInputStream.setSizeLimit() to"
+            + " increase the size limit. If reading multiple messages, consider resetting the"
+            + " counter between each message using CodedInputStream.resetSizeCounter().");
   }
 
   static InvalidProtocolBufferException parseFailure() {