Merge lp:~albaguirre/mir/fix-1522093 into lp:mir

[Alberto Aguirre]

session mediator: exchange_buffer: throw when unable to retrieve a buffer for the given stream id

session mediator: exchange_buffer: throw when unable to retrieve a buffer for the given stream id

[Alan Griffiths (alan-griffiths)]

LGTM

review: Approve

[Kevin DuBois (kdub)]

alright

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3162
http://jenkins.qa.ubuntu.com/job/mir-ci/5750/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5157
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4063
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5105
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-xenial-touch/79/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/79
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/79/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/79
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/79/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5105
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5105/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7635
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25730
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-xenial-armhf/77/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/5750/rebuild

review: Approve (continuous-integration)

=== modified file 'src/server/frontend/session_mediator.cpp'
--- src/server/frontend/session_mediator.cpp	2015-11-26 10:44:43 +0000
+++ src/server/frontend/session_mediator.cpp	2015-12-02 16:46:58 +0000
@@ -354,7 +354,11 @@
     mg::BufferID const buffer_id{static_cast<uint32_t>(request->buffer().buffer_id())};
 
     mfd::ProtobufBufferPacker request_msg{const_cast<mir::protobuf::Buffer*>(&request->buffer())};
-    ipc_operations->unpack_buffer(request_msg, *buffer_stream_tracker.last_buffer(stream_id));
+    auto buffer = buffer_stream_tracker.last_buffer(stream_id);
+    if (!buffer)
+        BOOST_THROW_EXCEPTION(std::logic_error("No buffer found for given stream id"));
+
+    ipc_operations->unpack_buffer(request_msg, *buffer);
 
     auto const session = weak_session.lock();
     if (!session)