commit 7ea72dcdeb8efc90701bfcc1f439e591e8938d4c
author Marco Nelissen <marcone@google.com> Mon Sep 19 14:08:16 2016 -0700
committer Marco Nelissen <marcone@google.com> Mon Sep 19 14:08:16 2016 -0700
tree c9065f6ad92dc3fb5bdcde1fafcd12221b92ea1f
parent 7b973eb89ea7088fe82f457cd10013bbe739bba4

Don't process objects with empty name

as this will result in a bad database entry.

Bug: 31526567
Change-Id: I2e2a88ca98b189300fa2885b082746252f920bb4

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