commit 0e0ca2a45fa34fbd4ee9445a9dc0ad9e410b47c8
author Marco Nelissen <marcone@google.com> Wed Sep 28 23:32:43 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Sep 28 23:32:43 2016 +0000
tree fcf9548c4c1c4ae9072c010be66ec423ffc9484b
parent 4bef85e1a90ebafaefff23cae1b09e8d347db7e5
parent 7ea72dcdeb8efc90701bfcc1f439e591e8938d4c

Don't process objects with empty name
am: 7ea72dcdeb

Change-Id: I778c3175cb4b4aa2b2a2c9eb8de02cf9068cec6e

media/mtp/MtpServer.cpp

diff --git a/media/mtp/MtpServer.cpp b/media/mtp/MtpServer.cpp
index 90f1a77..e39dcdd 100644
--- a/media/mtp/MtpServer.cpp
+++ b/media/mtp/MtpServer.cpp
@@ -927,6 +927,10 @@
     if (!mData.getUInt32(temp32)) return MTP_RESPONSE_INVALID_PARAMETER;  // sequence number
     MtpStringBuffer name, created, modified;
     if (!mData.getString(name)) return MTP_RESPONSE_INVALID_PARAMETER;    // file name
+    if (name.getCharCount() == 0) {
+        ALOGE("empty name");
+        return MTP_RESPONSE_INVALID_PARAMETER;
+    }
     if (!mData.getString(created)) return MTP_RESPONSE_INVALID_PARAMETER;      // date created
     if (!mData.getString(modified)) return MTP_RESPONSE_INVALID_PARAMETER;     // date modified
     // keywords follow