diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-03-23 01:09:04 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-06 00:55:06 +0200 |
| commit | fe8508b948d045fbc02b2d81c305d9b445953be4 (patch) | |
| tree | d0777c20bde34d30d6c2e92d4f6be0067f962244 | |
| parent | 0d40fbaef09b62ea01ac1cd1ebaaa045ad285e9d (diff) | |
| download | ffmpeg-fe8508b948d045fbc02b2d81c305d9b445953be4.tar.gz | |
mov: fix global unicode convertion array overflow.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 437f5daf0bf727a53ea4b485a30f1289f44bf252)
| -rw-r--r-- | libavformat/mov.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index 95bc3dee40..59922d1123 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -160,7 +160,7 @@ static int mov_read_mac_string(MOVContext *c, AVIOContext *pb, int len, uint8_t t, c = avio_r8(pb); if (c < 0x80 && p < end) *p++ = c; - else + else if (p < end) PUT_UTF8(mac_to_unicode[c-0x80], t, if (p < end) *p++ = t;); } *p = 0; |