summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCody Schuffelen <schuffelen@google.com>2019-08-28 20:14:42 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-08-28 20:14:42 -0700
commitd5da389713c57505c68aefb2b4b17f6814267544 (patch)
tree448ebb7652ac7eca41173a0a2f513bd4679a312f
parentf981ccab90653828300293f77ea1b1624c1a42ff (diff)
parentb11b4603ecb1664b860568fef1863fd9297608f3 (diff)
downloadcuttlefish_common-d5da389713c57505c68aefb2b4b17f6814267544.tar.gz
Fix unspecified behavior in SharedFD constructors.
am: b11b4603ec Change-Id: Ie253b232e68e25473010c23c6b54f22eda90217f
-rw-r--r--common/libs/fs/shared_fd.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/common/libs/fs/shared_fd.cpp b/common/libs/fs/shared_fd.cpp
index 6ca2826d..dde06046 100644
--- a/common/libs/fs/shared_fd.cpp
+++ b/common/libs/fs/shared_fd.cpp
@@ -244,13 +244,13 @@ bool SharedFD::Pipe(SharedFD* fd0, SharedFD* fd1) {
}
SharedFD SharedFD::Event(int initval, int flags) {
- return std::shared_ptr<FileInstance>(
- new FileInstance(eventfd(initval, flags), errno));
+ int fd = eventfd(initval, flags);
+ return std::shared_ptr<FileInstance>(new FileInstance(fd, errno));
}
SharedFD SharedFD::Epoll(int flags) {
- return std::shared_ptr<FileInstance>(
- new FileInstance(epoll_create1(flags), errno));
+ int fd = epoll_create1(flags);
+ return std::shared_ptr<FileInstance>(new FileInstance(fd, errno));
}
bool SharedFD::SocketPair(int domain, int type, int protocol,