Commit 09b3a424 authored by Bruce Dawson's avatar Bruce Dawson Committed by Hendrik Leppkes

riffdec: Explicitly null-terminate array to work around VC++ bug

Due to this bug in VC++ 2015 Update 1:
https://connect.microsoft.com/VisualStudio/feedback/details/2291638

the 'key' array in ff_read_riff_info() ends up being not null
terminated which led to failures in a Chromium unit tests. Update 2
should have a fix, but until then it is important to avoid problems.
parent f85cc3bf
...@@ -279,6 +279,9 @@ int ff_read_riff_info(AVFormatContext *s, int64_t size) ...@@ -279,6 +279,9 @@ int ff_read_riff_info(AVFormatContext *s, int64_t size)
} }
AV_WL32(key, chunk_code); AV_WL32(key, chunk_code);
// Work around VC++ 2015 Update 1 code-gen bug:
// https://connect.microsoft.com/VisualStudio/feedback/details/2291638
key[4] = 0;
if (avio_read(pb, value, chunk_size) != chunk_size) { if (avio_read(pb, value, chunk_size) != chunk_size) {
av_log(s, AV_LOG_WARNING, av_log(s, AV_LOG_WARNING,
......
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