Skip to content

Fix issue with file://con, connected to an anonymous pipe, and short reads #3176

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
joncampbell123 wants to merge 1 commit into
base: master
Choose a base branch
from
+18 −1
Open

Fix issue with file://con, connected to an anonymous pipe, and short reads #3176

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
19 changes: 18 additions & 1 deletion apps/transmitmedia.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -710,8 +710,10 @@ class ConsoleSource: public Source
ConsoleSource()
#ifdef _WIN32
: may_block(true)
#else
#elif defined(FIONREAD)
: may_block(fcntl(fileno(stdin), F_SETFL, fcntl(fileno(stdin), F_GETFL) | O_NONBLOCK) < 0)
#else
: may_block(true)
#endif
{
#ifdef _WIN32
Expand All @@ -723,6 +725,21 @@ class ConsoleSource: public Source

int Read(size_t chunk, MediaPacket& pkt, ostream & ignored SRT_ATR_UNUSED = cout) override
{
#if defined(FIONREAD)
// The trouble with O_NONBLOCK is that read() may return less than the expected data if not enough available
// which then causes a full size SRT packet padded with zeros. Use FIONREAD, if possible, to make sure that
// read() returns either chunk bytes or nothing at all.
if (!may_block) {
int br = 0;
if (ioctl(GetSysSocket(), FIONREAD, &br) >= 0) {
if (br < 0 || size_t(br) < chunk) {
pkt.payload.clear();
return 0;
}
}
}
#endif

if (pkt.payload.size() < chunk)
pkt.payload.resize(chunk);

Expand Down