From 372938942ffc1a7cc3e87cb5be524f234077f5c6 Mon Sep 17 00:00:00 2001 From: Primiano Tucci Date: Fri, 26 Jan 2018 17:28:58 +0000 Subject: [PATCH] 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 --- libs/services/src/os/DropBoxManager.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libs/services/src/os/DropBoxManager.cpp b/libs/services/src/os/DropBoxManager.cpp index e8e34d7c4cb3a..95246a0d270f5 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 -