[vlc-commits] demux: mp4: fix NULL deref (cid #1313697)
Francois Cartegnie
git at videolan.org
Wed Jan 25 10:08:21 CET 2017
vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Wed Jan 25 10:00:22 2017 +0100| [2ba10fd242072146a5877217bdc54ac92c1d44e2] | committer: Francois Cartegnie
demux: mp4: fix NULL deref (cid #1313697)
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2ba10fd242072146a5877217bdc54ac92c1d44e2
---
modules/demux/mp4/mp4.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c
index 7b912ac..d63c69b 100644
--- a/modules/demux/mp4/mp4.c
+++ b/modules/demux/mp4/mp4.c
@@ -1864,10 +1864,12 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
}
}
- if( p_udta == NULL && !b_attachment_set )
- return VLC_EGENERIC;
-
- SetupMeta( p_meta, p_udta );
+ if( p_udta == NULL )
+ {
+ if( !b_attachment_set )
+ return VLC_EGENERIC;
+ }
+ else SetupMeta( p_meta, p_udta );
return VLC_SUCCESS;
}
More information about the vlc-commits
mailing list