summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/Object.cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2012-05-18 14:15:31 +0200
committerBenoit Foucher <benoit@zeroc.com>2012-05-18 14:15:31 +0200
commitf9f3a6a1eeee875446b987202939fdf67af3eacb (patch)
treefc5d6049b9b5bb82ed8414647a06888cb018a60e /cpp/src/Ice/Object.cpp
parentBasicStream refactoring (diff)
downloadice-f9f3a6a1eeee875446b987202939fdf67af3eacb.tar.bz2
ice-f9f3a6a1eeee875446b987202939fdf67af3eacb.tar.xz
ice-f9f3a6a1eeee875446b987202939fdf67af3eacb.zip
Win32 blobject STL debug assert
Diffstat (limited to 'cpp/src/Ice/Object.cpp')
-rw-r--r--cpp/src/Ice/Object.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/cpp/src/Ice/Object.cpp b/cpp/src/Ice/Object.cpp
index 6e12657f4b7..8cce4a577a0 100644
--- a/cpp/src/Ice/Object.cpp
+++ b/cpp/src/Ice/Object.cpp
@@ -313,7 +313,14 @@ Ice::Blobject::__dispatch(Incoming& in, const Current& current)
in.readParamEncaps(inEncaps, sz);
vector<Byte> outEncaps;
bool ok = ice_invoke(vector<Byte>(inEncaps, inEncaps + sz), outEncaps, current);
- in.__writeParamEncaps(&outEncaps[0], outEncaps.size(), ok);
+ if(outEncaps.empty())
+ {
+ in.__writeParamEncaps(0, 0, ok);
+ }
+ else
+ {
+ in.__writeParamEncaps(&outEncaps[0], outEncaps.size(), ok);
+ }
if(ok)
{
return DispatchOK;