Fixes: 16144/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_LIBVORBIS_fuzzer-5638618940440576 Fixes: out of array read
Unified · Split
| @@ -64,22 +64,25 @@ static int oggvorbis_decode_init(AVCodecContext *avccontext) { · 63 unmodified lines | ||
| 64 | 64 | } |
| 65 | 65 | } else if(*p == 2) { |
| 66 | 66 | unsigned int offset = 1; |
| 67 | + unsigned int sizesum = 1; | |
| 67 | 68 | p++; |
| 68 | 69 | for(i=0; i<2; i++) { |
| 69 | 70 | hsizes[i] = 0; |
| 70 | − while((*p == 0xFF) && (offset < avccontext->extradata_size)) { | |
| 71 | + while((*p == 0xFF) && (sizesum < avccontext->extradata_size)) { | |
| 71 | 72 | hsizes[i] += 0xFF; |
| 72 | 73 | offset++; |
| 74 | + sizesum += 1 + 0xFF; | |
| 73 | 75 | p++; |
| 74 | 76 | } |
| 75 | − if(offset >= avccontext->extradata_size - 1) { | |
| 77 | + hsizes[i] += *p; | |
| 78 | + offset++; | |
| 79 | + sizesum += 1 + *p; | |
| 80 | + if(sizesum > avccontext->extradata_size) { | |
| 76 | 81 | av_log(avccontext, AV_LOG_ERROR, |
| 77 | 82 | "vorbis header sizes damaged\n"); |
| 78 | 83 | ret = AVERROR_INVALIDDATA; |
| 79 | 84 | goto error; |
| 80 | 85 | } |
| 81 | − hsizes[i] += *p; | |
| 82 | − offset++; | |
| 83 | 86 | p++; |
| 84 | 87 | } |
| 85 | 88 | hsizes[2] = avccontext->extradata_size - hsizes[0]-hsizes[1]-offset; |