diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-03-23 01:09:04 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-03-23 01:09:04 +0100 |
commit | 437f5daf0bf727a53ea4b485a30f1289f44bf252 (patch) | |
tree | 4f2058b585e107b946fa99d7d206f06f933fa8ca /libavformat/mov.c | |
parent | 0c97fd336e17535239ab44d755a0d957dc2688f3 (diff) | |
download | ffmpeg-437f5daf0bf727a53ea4b485a30f1289f44bf252.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>
Diffstat (limited to 'libavformat/mov.c')
-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 2687a88816..66c1886112 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; |