diff options
| -rw-r--r-- | java/src/IceInternal/BasicStream.java | 4 | ||||
| -rw-r--r-- | java/src/IceInternal/BufferManager.java | 26 |
2 files changed, 26 insertions, 4 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; diff --git a/java/src/IceInternal/BufferManager.java b/java/src/IceInternal/BufferManager.java index fde144ccd94..63abf762423 100644 --- a/java/src/IceInternal/BufferManager.java +++ b/java/src/IceInternal/BufferManager.java @@ -23,8 +23,17 @@ final class BufferManager java.nio.ByteBuffer buf = getBuffer(size); if (buf == null) { - //buf = java.nio.ByteBuffer.allocateDirect(size); - buf = java.nio.ByteBuffer.allocate(size); + try + { + //buf = java.nio.ByteBuffer.allocateDirect(size); + buf = java.nio.ByteBuffer.allocate(size); + } + catch (OutOfMemoryError ex) + { + Ice.MemoryLimitException e = new Ice.MemoryLimitException(); + e.initCause(ex); + throw e; + } buf.order(java.nio.ByteOrder.LITTLE_ENDIAN); } return buf; @@ -36,8 +45,17 @@ final class BufferManager java.nio.ByteBuffer buf = getBuffer(size); if (buf == null) { - //buf = java.nio.ByteBuffer.allocateDirect(size); - buf = java.nio.ByteBuffer.allocate(size); + try + { + //buf = java.nio.ByteBuffer.allocateDirect(size); + buf = java.nio.ByteBuffer.allocate(size); + } + catch (OutOfMemoryError ex) + { + Ice.MemoryLimitException e = new Ice.MemoryLimitException(); + e.initCause(ex); + throw e; + } buf.order(java.nio.ByteOrder.LITTLE_ENDIAN); } buf.put(old); |