diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-09-11 09:42:35 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-09-11 15:18:26 +0200 |
| commit | bb209f2f53edc1b0d268d561e0c12bf93e83fb41 (patch) | |
| tree | 09ede9f9b8c8ff39c8b958fcf000580681ca59b1 /binaryurp | |
| parent | a1949a419e2e4bec52906bb163b0cf510fe2aa14 (diff) | |
Revert "clang bugprone-unused-return-value"
comment from sberg:
aren't these changes broken in general, when the called function
may throw an exception before it takes ownership of the passed-in pointer?
So revert, except for
(a) PlainTextFilterDetect::detect, which was definitely a leak
(b) SwCursor::FindAll, where unique_ptr was being unnecessarily used
This reverts commit 7764ae70b04058a64a3999529e98d1115ba59d1c.
Change-Id: I555e651b44e245b031729013d2ce88d26e8a357e
Reviewed-on: https://gerrit.libreoffice.org/60301
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'binaryurp')
| -rw-r--r-- | binaryurp/source/reader.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/binaryurp/source/reader.cxx b/binaryurp/source/reader.cxx index c40aeadea7df..fa5e91be704e 100644 --- a/binaryurp/source/reader.cxx +++ b/binaryurp/source/reader.cxx @@ -335,8 +335,9 @@ void Reader::readMessage(Unmarshal & unmarshal) { bridge_->incrementActiveCalls(); } uno_threadpool_putJob( - bridge_->getThreadPool(), tid.getHandle(), req.release(), &request, + bridge_->getThreadPool(), tid.getHandle(), req.get(), &request, !synchronous); + req.release(); } } @@ -442,8 +443,9 @@ void Reader::readReplyMessage(Unmarshal & unmarshal, sal_uInt8 flags1) { std::unique_ptr< IncomingReply > resp( new IncomingReply(exc, ret, outArgs)); uno_threadpool_putJob( - bridge_->getThreadPool(), tid.getHandle(), resp.release(), nullptr, + bridge_->getThreadPool(), tid.getHandle(), resp.get(), nullptr, false); + resp.release(); break; } case OutgoingRequest::KIND_REQUEST_CHANGE: |