Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC
Manage
Activity
Members
Labels
Plan
Issues
4k
Issue boards
Milestones
Code
Merge requests
458
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Contributor analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VideoLAN
VLC
Merge requests
!6732
contrib: dvdnav: turn assert+exit into silent discard
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
contrib: dvdnav: turn assert+exit into silent discard
robUx4/vlc:dvdnad-assert
into
master
Overview
1
Commits
1
Pipelines
3
Changes
3
Merged
Steve Lhomme
requested to merge
robUx4/vlc:dvdnad-assert
into
master
2 months ago
Overview
1
Commits
1
Pipelines
3
Changes
3
Expand
This fixes playback on some bogus DVDs.
0
0
Merge request reports
Compare
master
version 1
446ae3e4
2 months ago
master (base)
and
latest version
latest version
ef256ba8
1 commit,
2 months ago
version 1
446ae3e4
1 commit,
2 months ago
3 files
+
63
−
0
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
3
Search (e.g. *.vue) (Ctrl+P)
contrib/src/dvdnav/0001-play-avoid-assert-and-exit-and-bogus-PG-link.patch
0 → 100644
+
30
−
0
Options
From ff8676289c227d03293f63152d327b2a16775eea Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Fri, 24 Jan 2025 13:34:52 +0100
Subject: [PATCH 1/2] play: avoid assert and exit and bogus PG link
Just return LinkNoLink.
---
src/vm/play.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/vm/play.c b/src/vm/play.c
index 8830883..e5d0e72 100644
--- a/src/vm/play.c
+++ b/src/vm/play.c
@@ -177,7 +177,11 @@
link_t play_PG(vm_t *vm) {
Log3(vm, "play_PG: (vm->state).pgN (%i) > pgc->nr_of_programs (%i)",
(vm->state).pgN, (vm->state).pgc->nr_of_programs );
#endif
- assert((vm->state).pgN == (vm->state).pgc->nr_of_programs + 1);
+ if((vm->state).pgN > (vm->state).pgc->nr_of_programs + 1) {
+ /* bogus link, ignore it */
+ link_t link_values = { LinkNoLink, 0, 0, 0 };
+ return link_values;
+ }
return play_PGC_post(vm);
}
--
2.45.0.windows.1
Loading