commit 85355f0e81ce401de2914c6108569c6b1a1dbb7d
author Andrew Lewis <andrewlewis@google.com> Sat Jun 27 22:38:45 2020 +0100
committer Andrew Lewis <andrewlewis@google.com> Tue Jun 30 17:23:50 2020 +0100
tree c89c95317bf8a84caba2cf7d87b2cbfaae2da300
parent 1928cddbe98a24e173d1b83b870c67cd8f2deffb

Fix FD ownership for local FileSource

PlayerServiceFileSource took ownership of the GenericSource's FD and
closed it if extraction failed, causing a SIGABRT from fdsan. Fix this
by dup'ing the FD before passing to PlayerServiceFileSource.

Bug: 160136562
Bug: 159810405
Test: manually tested SIGABRT disappears after this change
Change-Id: I3f1f5daadba27bc75e2b550884d7bba559d6f2e7

media/libmediaplayerservice/nuplayer/GenericSource.cpp

diff --git a/media/libmediaplayerservice/nuplayer/GenericSource.cpp b/media/libmediaplayerservice/nuplayer/GenericSource.cpp
index e6bb2e1..439dbe8 100644
--- a/media/libmediaplayerservice/nuplayer/GenericSource.cpp
+++ b/media/libmediaplayerservice/nuplayer/GenericSource.cpp
@@ -432,7 +432,7 @@
             }
             if (mDataSource == nullptr) {
                 ALOGD("FileSource local");
-                mDataSource = new PlayerServiceFileSource(mFd.get(), mOffset, mLength);
+                mDataSource = new PlayerServiceFileSource(dup(mFd.get()), mOffset, mLength);
             }
         }