commit ddb2a28a0b8ab4482395e003ee5eaf630eaa6066
author Marco Nelissen <marcone@google.com> Wed Sep 28 23:35:15 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Sep 28 23:35:15 2016 +0000
tree e450f9fac9b322dddfefb56d67e7ba16e5b0b0dd
parent a578c4f37861fd26ff6a8b4836c1e7acbad60c75
parent 0e0ca2a45fa34fbd4ee9445a9dc0ad9e410b47c8

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

Change-Id: I2240fc25b0234fde68a9599e317e3cc5c1fe63f2

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