summaryrefslogtreecommitdiff
path: root/libs/services/src/os/DropBoxManager.cpp
diff options
context:
space:
mode:
authorPrimiano Tucci <primiano@google.com>2018-01-26 17:28:58 +0000
committerPrimiano Tucci <primiano@google.com>2018-01-26 17:30:45 +0000
commit372938942ffc1a7cc3e87cb5be524f234077f5c6 (patch)
tree0a0177d42475f89bf9159779030ed7e9785f4007 /libs/services/src/os/DropBoxManager.cpp
parent656096516cf0af5ade7174d441d1a7ca47a77ccd (diff)
DropboxManager: Add err message if passing an invalid fd to addFile()
Follow up to I076bfd3180fb9b4baff7e1bae2e611419061b2a7. Adds an error message if passing -1 to addFile(int fd) Change-Id: I73a8d88f12b14bc28ea3bc3782a9df7d96d53c92 Test: builds
Diffstat (limited to 'libs/services/src/os/DropBoxManager.cpp')
-rw-r--r--libs/services/src/os/DropBoxManager.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/libs/services/src/os/DropBoxManager.cpp b/libs/services/src/os/DropBoxManager.cpp
index e8e34d7c4cb3..95246a0d270f 100644
--- 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
-