diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2016-04-26 09:00:57 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2016-04-26 09:00:57 +0200 |
| commit | c2ce37b7b0f6fc033cac4d52d460ee2f389d7737 (patch) | |
| tree | dab204bc1dfd9298c7acb13b9493a210f8c4e978 /java/src | |
| parent | Add jquery-cookie to bower dependency (diff) | |
| download | ice-c2ce37b7b0f6fc033cac4d52d460ee2f389d7737.tar.bz2 ice-c2ce37b7b0f6fc033cac4d52d460ee2f389d7737.tar.xz ice-c2ce37b7b0f6fc033cac4d52d460ee2f389d7737.zip | |
Fixed ICE-7115 - unmarshalling bug with optional parameters
Diffstat (limited to 'java/src')
3 files changed, 17 insertions, 12 deletions
diff --git a/java/src/Ice/src/main/java/IceInternal/BasicStream.java b/java/src/Ice/src/main/java/IceInternal/BasicStream.java index 5b40a3beb64..e83a2e5234c 100644 --- a/java/src/Ice/src/main/java/IceInternal/BasicStream.java +++ b/java/src/Ice/src/main/java/IceInternal/BasicStream.java @@ -412,29 +412,35 @@ public class BasicStream _readEncapsCache.reset(); } - public void - skipEmptyEncaps(Ice.EncodingVersion encoding) + public Ice.EncodingVersion + skipEmptyEncaps() { int sz = readInt(); - if(sz != 6) + if(sz < 6) { throw new Ice.EncapsulationException(); } - - final int pos = _buf.b.position(); - if(pos + 2 > _buf.size()) + if(sz - 4 > _buf.b.remaining()) { throw new Ice.UnmarshalOutOfBoundsException(); } - if(encoding != null) + Ice.EncodingVersion encoding = new Ice.EncodingVersion(); + encoding.__read(this); + if(encoding.equals(Ice.Util.Encoding_1_0)) { - encoding.__read(this); + if(sz != 6) + { + throw new Ice.EncapsulationException(); + } } else { - _buf.b.position(pos + 2); + // Skip the optional content of the encapsulation if we are expecting an + // empty encapsulation. + _buf.b.position(_buf.b.position() + sz - 6); } + return encoding; } public void diff --git a/java/src/Ice/src/main/java/IceInternal/Incoming.java b/java/src/Ice/src/main/java/IceInternal/Incoming.java index 9afd6ed4903..6f1f205854f 100644 --- a/java/src/Ice/src/main/java/IceInternal/Incoming.java +++ b/java/src/Ice/src/main/java/IceInternal/Incoming.java @@ -383,8 +383,7 @@ final public class Incoming extends IncomingBase implements Ice.Request public final void readEmptyParams() { - _current.encoding = new Ice.EncodingVersion(); - _is.skipEmptyEncaps(_current.encoding); + _current.encoding = _is.skipEmptyEncaps(); } public final byte[] diff --git a/java/src/Ice/src/main/java/IceInternal/OutgoingAsync.java b/java/src/Ice/src/main/java/IceInternal/OutgoingAsync.java index 8d776c84af4..55050ec5cc6 100644 --- a/java/src/Ice/src/main/java/IceInternal/OutgoingAsync.java +++ b/java/src/Ice/src/main/java/IceInternal/OutgoingAsync.java @@ -382,7 +382,7 @@ public class OutgoingAsync extends ProxyOutgoingAsyncBase public void readEmptyParams() { - _is.skipEmptyEncaps(null); + _is.skipEmptyEncaps(); } public byte[] readParamEncaps() |