Bug 121868 – Use std::unique_ptr for decoders as well

• Status: RESOLVED
• Resolution: FIXED
• Component: New Bugs

[Anders Carlsson]

Use std::unique_ptr for decoders as well

[Anders Carlsson]

Created attachment 212501 [details]
Patch

[Andreas Kling]

Comment on attachment 212501 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=212501&action=review

> Source/WebKit2/Platform/CoreIPC/Connection.cpp:417
> -        HashMap<std::pair<std::pair<StringReference, StringReference>, uint64_t>, OwnPtr<MessageDecoder>>::iterator it = m_waitForMessageMap.find(messageAndDestination);
> -        if (it->value) {
> -            OwnPtr<MessageDecoder> decoder = it->value.release();
> -            m_waitForMessageMap.remove(it);
> -
> -            return decoder.release();
> -        }
> +        if (std::unique_ptr<MessageDecoder> decoder = m_waitForMessageMap.take(messageAndDestination))
> +            return decoder;

This is wrong, you are now always taking the decoder out of the map!

[Anders Carlsson]

Created attachment 212503 [details]
Patch

[Andreas Kling]

Comment on attachment 212503 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=212503&action=review

> Source/WebKit2/Platform/CoreIPC/Connection.cpp:425
> -        HashMap<std::pair<std::pair<StringReference, StringReference>, uint64_t>, OwnPtr<MessageDecoder>>::iterator it = m_waitForMessageMap.find(messageAndDestination);
> +        auto it = m_waitForMessageMap.find(messageAndDestination);
>          if (it->value) {
> -            OwnPtr<MessageDecoder> decoder = it->value.release();
> +            std::unique_ptr<MessageDecoder> decoder = std::move(it->value);
>              m_waitForMessageMap.remove(it);
>  
> -            return decoder.release();
> +            return decoder;
>          }
> +
> +        if (std::unique_ptr<MessageDecoder> decoder = m_waitForMessageMap.take(messageAndDestination))
> +            return decoder;

Still has the bug. :|

[Anders Carlsson]

Created attachment 212504 [details]
Patch

[Anders Carlsson]

Committed r156360: <http://trac.webkit.org/changeset/156360>

[Csaba Osztrogonác]

(In reply to comment #6)
> Committed r156360: <http://trac.webkit.org/changeset/156360>

Unix buildfix landed in http://trac.webkit.org/changeset/156363