mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-08 13:22:53 +02:00
matroskadec: fix NULL pointer dereference
The problem was introduced in commit 1273bc6
.
Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
This commit is contained in:
parent
d3874b74f3
commit
eb751f06db
@ -1759,7 +1759,7 @@ static int mkv_field_order(MatroskaDemuxContext *matroska, int64_t field_order)
|
|||||||
|
|
||||||
/* workaround a bug in our Matroska muxer, introduced in version 57.36 alongside
|
/* workaround a bug in our Matroska muxer, introduced in version 57.36 alongside
|
||||||
* this function, and fixed in 57.52 */
|
* this function, and fixed in 57.52 */
|
||||||
if (sscanf(matroska->muxingapp, "Lavf%d.%d.%d", &major, &minor, µ) == 3)
|
if (matroska->muxingapp && sscanf(matroska->muxingapp, "Lavf%d.%d.%d", &major, &minor, µ) == 3)
|
||||||
bttb = (major == 57 && minor >= 36 && minor <= 51 && micro >= 100);
|
bttb = (major == 57 && minor >= 36 && minor <= 51 && micro >= 100);
|
||||||
|
|
||||||
switch (field_order) {
|
switch (field_order) {
|
||||||
|
Loading…
Reference in New Issue
Block a user