Browse Source

mov: fix a possible invalid read in mov_read_mac_string()

When the input string is too large, so the second condition in if ()
fails, the code will erroneously execute the else branch, indexing the
mac_to_unicode table with a negative index.

CC: libav-stable@libav.org
Bug-Id: 1000
Found-By: Kamil Frankowicz
tags/n3.4
Anton Khirnov 9 years ago
parent
commit
46191a2da1
1 changed files with 5 additions and 1 deletions
  1. +5
    -1
      libavformat/mov.c

+ 5
- 1
libavformat/mov.c View File

@@ -161,7 +161,11 @@ static int mov_read_mac_string(MOVContext *c, AVIOContext *pb, int len,

for (i = 0; i < len; i++) {
uint8_t t, c = avio_r8(pb);
if (c < 0x80 && p < end)

if (p >= end)
continue;

if (c < 0x80)
*p++ = c;
else
PUT_UTF8(mac_to_unicode[c-0x80], t, if (p < end) *p++ = t;);


Loading…
Cancel
Save