Skip to content

Fix file descriptor leak in setDataSource method #2975

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yannaingtun wants to merge 1 commit into
base: version_component
Choose a base branch
from
Open

Fix file descriptor leak in setDataSource method #2975

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions ijkplayer-java/src/main/java/tv/danmaku/ijk/media/player/IjkMediaPlayer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,8 +479,17 @@ public void setDataSource(FileDescriptor fd)
*/
private void setDataSource(FileDescriptor fd, long offset, long length)
throws IOException, IllegalArgumentException, IllegalStateException {
// FIXME: handle offset, length
setDataSource(fd);
// Create a duplicated file descriptor that we can close safely
ParcelFileDescriptor pfd = ParcelFileDescriptor.dup(fd);
try {
// Use the duplicated file descriptor and handle offset and length
// Instead of calling setDataSource(fd) which would duplicate again unnecessarily
_setDataSourceFd(pfd.getFd());
// TODO: handle offset and length when needed
} finally {
// Make sure to close the duplicated file descriptor
pfd.close();
}
}

public void setDataSource(IMediaDataSource mediaDataSource)
Expand Down