Merge lp:~cyphermox/mtp/recursive-delete-fix into lp:mtp

[Mathieu Trudel-Lapierre]

Fix crash when recursively deleting directories; due to the concurrency between inotify notifications from filesystem changes and the delete method already removing items from the database.

Fix crash when recursively deleting directories; due to the concurrency between inotify notifications from filesystem changes and the delete method already removing items from the database.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:62
http://jenkins.qa.ubuntu.com/job/mtp-ci/30/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mtp-vivid-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mtp-vivid-armhf-ci/2
        deb: http://jenkins.qa.ubuntu.com/job/mtp-vivid-armhf-ci/2/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mtp-vivid-i386-ci/2

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

review: Approve (continuous-integration)

[Ricardo Salveti (rsalveti)]

LGTM

review: Approve

=== modified file 'server/UbuntuMtpDatabase.h'
--- server/UbuntuMtpDatabase.h	2014-09-08 19:27:06 +0000
+++ server/UbuntuMtpDatabase.h	2015-01-26 20:06:32 +0000
@@ -252,6 +252,7 @@
             const char* cdata = processed + asio::buffer_cast<const char*>(buf.data());
             const inotify_event* ievent = reinterpret_cast<const inotify_event*>(cdata);
             MtpObjectHandle parent;
+            path p;
      
             processed += sizeof(inotify_event) + ievent->len;
      
@@ -262,7 +263,12 @@
                 }
             }
 
-            path p(db.at(parent).path + "/" + ievent->name);
+            try {
+                p = path(db.at(parent).path + "/" + ievent->name);
+            } catch (...) {
+                PLOG(WARNING) << "Could not find parent for event " << ievent->name;
+                continue;
+            }
 
             if(ievent->len > 0 && ievent->mask & IN_MODIFY)
             {