1 files changed, 4 insertions, 0 deletions
diff --git a/java/src/IceInternal/BasicStream.java b/java/src/IceInternal/BasicStream.java
index 992a2feee84..cfddbf774b5 100644
--- a/java/src/IceInternal/BasicStream.java
+++ b/java/src/IceInternal/BasicStream.java
@@ -932,6 +932,10 @@ public class BasicStream
         if (_buf.position() == _limit)
         {
             _limit += size;
+            if (_limit > MAX)
+            {
+                throw new Ice.MemoryLimitException();
+            }
             if (_limit > _capacity)
             {
                 final int cap2 = _capacity << 1;