diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2017-01-25 08:27:30 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2017-01-25 08:27:30 +0100 |
| commit | 85eb74ccd16898b513f14aa7aad10e9158efab47 (patch) | |
| tree | eaee024e1a82cc6b5f0bd438e88866e114fe2092 /cpp | |
| parent | Fixed ICE-7521 - Windows tries to run Objective-C tests (diff) | |
| download | ice-85eb74ccd16898b513f14aa7aad10e9158efab47.tar.bz2 ice-85eb74ccd16898b513f14aa7aad10e9158efab47.tar.xz ice-85eb74ccd16898b513f14aa7aad10e9158efab47.zip | |
Fixed ICE-7281 - skipEmptyEncapsulation now checks for the encoding version
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/include/Ice/InputStream.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/cpp/include/Ice/InputStream.h b/cpp/include/Ice/InputStream.h index 552289a69f4..a6cad15a451 100644 --- a/cpp/include/Ice/InputStream.h +++ b/cpp/include/Ice/InputStream.h @@ -266,6 +266,8 @@ public: } Ice::EncodingVersion encoding; read(encoding); + IceInternal::checkSupportedEncoding(encoding); // Make sure the encoding is supported + if(encoding == Ice::Encoding_1_0) { if(sz != static_cast<Ice::Int>(sizeof(Ice::Int)) + 2) |