Skip to content

stream/dvdnav: fix NULL deref and wrong buffer in navigation event handling #18140

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

stream/dvdnav: fix NULL deref and wrong buffer in navigation event handling #18140

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
4 changes: 3 additions & 1 deletion stream/stream_dvdnav.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,8 @@ static int fill_buffer(stream_t *s, void *buf, int max_len)
return 0;
case DVDNAV_NAV_PACKET: {
pci_t *pnavpci = dvdnav_get_current_nav_pci(dvdnav);
if (!pnavpci)
break;
uint32_t start_pts = pnavpci->pci_gi.vobu_s_ptm;
MP_TRACE(s, "start pts = %"PRIu32"\n", start_pts);
break;
Expand All @@ -322,7 +324,7 @@ static int fill_buffer(stream_t *s, void *buf, int max_len)
case DVDNAV_VTS_CHANGE: {
int tit = 0, part = 0;
dvdnav_vts_change_event_t *vts_event =
(dvdnav_vts_change_event_t *)s->buffer;
(dvdnav_vts_change_event_t *)buf;
MP_INFO(s, "DVDNAV, switched to title: %d\n",
vts_event->new_vtsN);
if (!priv->had_initial_vts) {
Expand Down