Merge lp:~kdub/mir/fix-1200782 into lp:~mir-team/mir/trunk

[Kevin DuBois]

fixes: lp:1200782 by freeing fd's associated with buffer package

problem history :)

rev 803: found that client was leaking buffer fd's on android only, submitted fix for lp:1192742
rev 823: in fixing 1198022, we removed the fix for 1192742, but left the test that checks the buffer fd's are freed
https://bugs.launchpad.net/mir/+bug/1200782 was filed when that test started failing.

The platform FD's which are sent over are different than the buffer package FD's. Both platform fd and buffer fd should be closed

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:856
http://jenkins.qa.ubuntu.com/job/mir-ci/1027/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1333
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1218
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/265
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/265/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=quantal,flavor=amd64/656

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

review: Approve (continuous-integration)

[Alan Griffiths (alan-griffiths)]

LGTM

review: Approve

=== modified file 'src/client/android/android_registrar.cpp'
--- src/client/android/android_registrar.cpp	2013-07-08 03:01:50 +0000
+++ src/client/android/android_registrar.cpp	2013-07-16 17:56:27 +0000
@@ -37,6 +37,10 @@
     void operator()(const native_handle_t* t)
     {
         module->unregisterBuffer(module.get(), t);
+        for(auto i = 0; i < t->numFds; i++)
+        {
+            close(t->data[i]);
+        }
         ::operator delete(const_cast<native_handle_t*>(t));
     }
 private: