Commit ac3fa95e authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '94603feb'

* commit '94603feb':
  h264_ps: when parsing a VUI fails, only abort when explode is set

Merge only for metadata, ignoring invalid data can put the context
into an invalid state and can possibly be used for remote code
execution exploits.
Also we support all non standard VUIs that have been reported so
ignoring parsing failure makes no sense for us unless theres
some issue that has not been reported
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents bdd3a746 94603feb
...@@ -520,9 +520,11 @@ int ff_h264_decode_seq_parameter_set(H264Context *h) ...@@ -520,9 +520,11 @@ int ff_h264_decode_seq_parameter_set(H264Context *h)
} }
sps->vui_parameters_present_flag = get_bits1(&h->gb); sps->vui_parameters_present_flag = get_bits1(&h->gb);
if (sps->vui_parameters_present_flag) if (sps->vui_parameters_present_flag) {
if (decode_vui_parameters(h, sps) < 0) int ret = decode_vui_parameters(h, sps);
if (ret < 0)
goto fail; goto fail;
}
if (!sps->sar.den) if (!sps->sar.den)
sps->sar.den = 1; sps->sar.den = 1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment