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 /registry | |
| 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 'registry')
| -rw-r--r-- | registry/source/regimpl.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/registry/source/regimpl.cxx b/registry/source/regimpl.cxx index ac065a3e65a3..a7647b9d512f 100644 --- a/registry/source/regimpl.cxx +++ b/registry/source/regimpl.cxx @@ -700,7 +700,8 @@ RegError ORegistry::openKey(RegKeyHandle hKey, const OUString& keyName, } std::unique_ptr< ORegKey > p(new ORegKey(path, this)); - i = m_openKeyTable.insert(std::make_pair(path, p.release())).first; + i = m_openKeyTable.insert(std::make_pair(path, p.get())).first; + p.release(); } else { i->second->acquire(); } |