Skip to content

fix: prevent infinite loop when processing TS files with no subtitles #1763

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

fix: prevent infinite loop when processing TS files with no subtitles #1763

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
14 changes: 12 additions & 2 deletions src/lib_ccx/ts_functions.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -676,13 +676,23 @@ long ts_readstream(struct ccx_demuxer *ctx, struct demuxer_data **data)
struct cap_info *cinfo;
struct ts_payload payload;
int j;
// FIX FOR BUG#1754: Add termination condition for TS files with no subtitles
long max_packets_without_subtitles = 50000; // Reasonable limit
int subtitle_found = 0;
// END FIX

memset(&payload, 0, sizeof(payload));

do
{
pcount++;

// FIX FOR BUG #1754: Terminate if no subtitles found after reasonable number of packets
if (pcount > max_packets_without_subtitles && !subtitle_found) {
dbg_print(CCX_DMT_PARSE, "No subtitle streams detected after %ld packets, stopping processing\n", pcount);
ret = CCX_EOF;
break;
}
// END FIX
// Exit the loop at EOF
ret = ts_readpacket(ctx, &payload);
if (ret != CCX_OK)
Expand Down Expand Up @@ -911,7 +921,7 @@ long ts_readstream(struct ccx_demuxer *ctx, struct demuxer_data **data)
{
dbg_print(CCX_DMT_PARSE, "\nPES finished (%ld bytes/%ld PES packets/%ld total packets)\n",
cinfo->capbuflen, pespcount, pcount);

subtitle_found = 1; // We found subtitle data
// Keep the data from capbuf to be worked on
ret = copy_capbuf_demux_data(ctx, data, cinfo);
cinfo->capbuflen = 0;
Expand Down
Loading