Merge "DropboxManager: Add err message if passing an invalid fd to addFile()"

2018-01-30 16:16:34 +00:00
parent 88d9ddd386 372938942f
commit 90529d212a
1 changed files with 5 additions and 1 deletions
--- a/libs/services/src/os/DropBoxManager.cpp
+++ b/libs/services/src/os/DropBoxManager.cpp
@@ -185,6 +185,11 @@ DropBoxManager::addFile(const String16& tag, const string& filename, int flags)
 Status
 DropBoxManager::addFile(const String16& tag, int fd, int flags)
 {
+    if (fd == -1) {
+        string message("invalid fd (-1) passed to to addFile");
+        ALOGW("DropboxManager: %s", message.c_str());
+        return Status::fromExceptionCode(Status::EX_ILLEGAL_STATE, message.c_str());
+    }
    Entry entry(tag, flags, fd);
    return add(entry);
 }
@@ -201,4 +206,3 @@ DropBoxManager::add(const Entry& entry)
 }

 }} // namespace android::os
-