summaryrefslogtreecommitdiff
path: root/py/modules/IcePy/Operation.cpp
diff options
context:
space:
mode:
authorDwayne Boone <dwayne@zeroc.com>2008-11-03 14:29:26 -0330
committerDwayne Boone <dwayne@zeroc.com>2008-11-03 14:29:26 -0330
commitac3b38bc31e530a234ab11aee49653fbc89182c0 (patch)
tree57dc1f08b404ec4a2a409ef213a738104a7a40c7 /py/modules/IcePy/Operation.cpp
parentBug 3377 - fixed getImplicitContext in IcePy (diff)
downloadice-ac3b38bc31e530a234ab11aee49653fbc89182c0.tar.bz2
ice-ac3b38bc31e530a234ab11aee49653fbc89182c0.tar.xz
ice-ac3b38bc31e530a234ab11aee49653fbc89182c0.zip
Bug 3379 - segfault when unmarsahlling proxy without definition loaded
Diffstat (limited to 'py/modules/IcePy/Operation.cpp')
-rw-r--r--py/modules/IcePy/Operation.cpp11
1 files changed, 9 insertions, 2 deletions
diff --git a/py/modules/IcePy/Operation.cpp b/py/modules/IcePy/Operation.cpp
index a112e6273d9..b2c19cf3d4f 100644
--- a/py/modules/IcePy/Operation.cpp
+++ b/py/modules/IcePy/Operation.cpp
@@ -1127,8 +1127,15 @@ IcePy::SyncTypedInvocation::invoke(PyObject* args)
else
{
PyObject* ret = PyTuple_GET_ITEM(results.get(), 0);
- Py_INCREF(ret);
- return ret;
+ if(!ret)
+ {
+ return 0;
+ }
+ else
+ {
+ Py_INCREF(ret);
+ return ret;
+ }
}
}
}