diff options
| author | Anton Khirnov <anton@khirnov.net> | 2014-01-13 13:47:07 +0100 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2014-02-06 23:01:14 -0500 |
| commit | 8cade1352bde1a1d4da70fc16a722a4fa7d2edc7 (patch) | |
| tree | 85e070bbae68bbe2b1e3518ee8ff12861e9e3067 /libavformat/mpegtsenc.c | |
| parent | 5522c564d48e1bb07d8cb722e8f94575a2683e29 (diff) | |
| download | ffmpeg-8cade1352bde1a1d4da70fc16a722a4fa7d2edc7.tar.gz | |
lavf: make av_probe_input_buffer more robust
Always use the actually read size as the offset instead of making
possibly invalid assumptions.
Addresses: CVE-2012-6618
(cherry picked from commit 2115a3597457231a6e5c0527fe0ff8550f64b733)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
Conflicts:
libavformat/utils.c
Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit 8575f5362f98c937758b20ff8512d6767a56208e)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
Diffstat (limited to 'libavformat/mpegtsenc.c')
0 files changed, 0 insertions, 0 deletions