diff options
| author | Rainer Hochecker <fernetmenta@online.de> | 2018-09-23 17:35:08 +0200 |
|---|---|---|
| committer | fritsch <Peter.Fruehberger@gmail.com> | 2018-09-24 19:41:45 +0200 |
| commit | b9a0a6742e742d644beec250bda6d69032df1375 (patch) | |
| tree | 80506ca46da9277f186a8949814f6f1af429f691 | |
| parent | 1c1ed9d2855165c4e4ed7339dfc5ba60088d9d07 (diff) | |
VideoPlayer: ffmpeg demuxer - fix out-of-bounds error related to probe buffer
| -rw-r--r-- | xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp index d3f2b447fa..b547687cf0 100644 --- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp +++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp @@ -318,11 +318,8 @@ bool CDVDDemuxFFmpeg::Open(std::shared_ptr<CDVDInputStream> pInput, bool streami pd.buf = probe_buffer.get(); pd.filename = strFile.c_str(); - // av_probe_input_buffer might have changed the buffer_size beyond our allocated amount - int buffer_size = std::min(probeBufferSize, m_ioContext->buffer_size); - buffer_size = m_ioContext->max_packet_size ? m_ioContext->max_packet_size : buffer_size; // read data using avformat's buffers - pd.buf_size = avio_read(m_ioContext, pd.buf, buffer_size); + pd.buf_size = avio_read(m_ioContext, pd.buf, probeBufferSize); if (pd.buf_size <= 0) { CLog::Log(LOGERROR, "%s - error reading from input stream, %s", __FUNCTION__, CURL::GetRedacted(strFile).c_str()); |