diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-06-02 16:38:12 +0100 |
|---|---|---|
| committer | Noel Power <noel.power@novell.com> | 2011-08-10 17:06:09 +0100 |
| commit | 342601dbbcd571dd72ad4a1d67ff6f6d20b47134 (patch) | |
| tree | 5f9106fd409ba2128cc2cd3655edf250442ad99b /binaryurp | |
| parent | 4ba6b44300c6911cf5275cb4b4a773507c4e7146 (diff) | |
round allocated struct return space to sizeof(size_t)
this fixes the sfx2 subsequenttest
Signed-off-by: Noel Power <noel.power@novell.com>
Diffstat (limited to 'binaryurp')
| -rw-r--r-- | binaryurp/source/incomingrequest.cxx | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/binaryurp/source/incomingrequest.cxx b/binaryurp/source/incomingrequest.cxx index 646a868f6..e6dde0683 100644 --- a/binaryurp/source/incomingrequest.cxx +++ b/binaryurp/source/incomingrequest.cxx @@ -131,6 +131,11 @@ void IncomingRequest::execute() const { } } +static size_t size_t_round(size_t val) +{ + return (val + (sizeof(size_t)-1)) & ~(sizeof(size_t)-1); +} + bool IncomingRequest::execute_throw( BinaryAny * returnValue, std::vector< BinaryAny > * outArguments) const { @@ -246,7 +251,10 @@ bool IncomingRequest::execute_throw( OSL_ASSERT(false); // this cannot happen break; } - std::vector< char > retBuf(retType.is() ? retType.get()->nSize : 0); + size_t nSize = 0; + if (retType.is()) + nSize = size_t_round(retType.get()->nSize); + std::vector< char > retBuf(nSize); uno_Any exc; uno_Any * pexc = &exc; (*object_.get()->pDispatcher)( |