Skip to content

Fix infinite loop on EOF/short-read in MAR-record reader (ArgusReadCo… #38

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

Merged
openargus merged 2 commits into from
Sep 8, 2026
Merged

Fix infinite loop on EOF/short-read in MAR-record reader (ArgusReadCo… #38

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
647910b
Fix infinite loop on EOF/short-read in MAR-record reader (ArgusReadCo…
openargus Sep 7, 2026
40c2bd1
Merge branch 'main' into fix/eof-infinite-loop-mar-reader
openargus Sep 8, 2026
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
45 changes: 34 additions & 11 deletions common/argus_util.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31738,7 +31738,20 @@ ArgusReadConnection (struct ArgusParserStruct *parser, struct ArgusInput *input,
#ifdef ARGUSDEBUG
ArgusDebug (1, "ArgusReadConnection() read returned zero %s.\n", strerror(errno));
#endif
/*
/*
* fread() returning <= 0 here means either EOF (feof()) or a
* read error (ferror()) -- in both cases there are no more
* bytes coming and this loop must not keep spinning waiting
* for cnt to reach size, since no future fread() call will
* make more progress. This exit path was previously commented
* out entirely, which meant a truncated or otherwise-short
* MAR record on this path put ArgusReadConnection() into an
* unconditional infinite loop -- a caller-supplied truncated
* native or compressed input file, or a decompression
* subprocess that exits early/produces less output than
* expected, would hang the client indefinitely with no way to
* make progress or exit.
*/
if (feof(input->file) || ferror(input->file)) {
if (input->pipe != NULL) {
pclose(input->pipe);
Expand All @@ -31749,7 +31762,6 @@ ArgusReadConnection (struct ArgusParserStruct *parser, struct ArgusInput *input,
input->file = NULL;
goto out;
}
*/
}
}
#ifdef ARGUSDEBUG
Expand Down Expand Up @@ -32143,16 +32155,27 @@ ArgusReadConnection (struct ArgusParserStruct *parser, struct ArgusInput *input,
#ifdef ARGUSDEBUG
ArgusDebug (1, "ArgusReadConnection() read returned zero %s.\n", strerror(errno));
#endif
if (br < 0) {
if (input->pipe != NULL) {
pclose(input->pipe);
input->pipe = NULL;
} else {
close (input->fd);
}
input->fd = -1;
goto out;
/*
* read() returning 0 here means the peer closed the
* connection cleanly (EOF) mid-handshake, not an error --
* br < 0 alone does not cover that case. Previously only
* br < 0 broke out of this loop, so a peer that
* disconnected (or never sent the remaining MAR bytes)
* right after the initial 16-byte header left this loop
* spinning on repeated zero-byte read() calls forever,
* since cnt can never reach size once the peer has
* nothing more to send. Treat br <= 0 as terminal, same
* as the sibling ARGUS_FILE case's equivalent fread()
* loop just above in this function.
*/
if (input->pipe != NULL) {
pclose(input->pipe);
input->pipe = NULL;
} else {
close (input->fd);
}
input->fd = -1;
goto out;
}
}
#ifdef ARGUSDEBUG
Expand Down
Loading