diff options
author | Taiju Tsuiki <tzik@google.com> | 2015-04-21 17:36:22 +0900 |
---|---|---|
committer | Steve Kondik <steve@cyngn.com> | 2015-12-18 17:30:09 -0500 |
commit | f36321997a15edce6ac88414c22efd07da9eb8dc (patch) | |
tree | c9a1fd89c4926aa4b1bfadf399418307a280c9dd /media/libmedia | |
parent | ab9b1e936c2da51d138b3989e90c774ef9bdef7f (diff) | |
download | frameworks_av-f36321997a15edce6ac88414c22efd07da9eb8dc.zip frameworks_av-f36321997a15edce6ac88414c22efd07da9eb8dc.tar.gz frameworks_av-f36321997a15edce6ac88414c22efd07da9eb8dc.tar.bz2 |
Fix potential double close in IMediaMetadataRetriever::setDataSource
IMediaMetadataRetriever::setDataSource(fd, offset, length) takes the ownership
of |fd| on the direct invocation, and doesn't take the ownership on invocation
from Binder. This is inconsintent to other similar methods like
IMediaPlayer::setDataSource, and causes potential double close of |fd|.
This CL changes the caller and implementations to leave the ownership to make
them consistent.
Also, fixes a double close in IMediaPlayerService::setDataSource in an error
case.
Change-Id: Id551a1e725c4392b0fe6b7293871212eb101c0a5
Diffstat (limited to 'media/libmedia')
-rw-r--r-- | media/libmedia/IMediaMetadataRetriever.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmedia/IMediaMetadataRetriever.cpp b/media/libmedia/IMediaMetadataRetriever.cpp index 9765f0d..dbf524e 100644 --- a/media/libmedia/IMediaMetadataRetriever.cpp +++ b/media/libmedia/IMediaMetadataRetriever.cpp @@ -240,7 +240,7 @@ status_t BnMediaMetadataRetriever::onTransact( } break; case SET_DATA_SOURCE_FD: { CHECK_INTERFACE(IMediaMetadataRetriever, data, reply); - int fd = dup(data.readFileDescriptor()); + int fd = data.readFileDescriptor(); int64_t offset = data.readInt64(); int64_t length = data.readInt64(); reply->writeInt32(setDataSource(fd, offset, length)); |