opensource/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-06-21 23:00:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

* fixing a buffer overrun in gif.c

Browse Source 
Originally committed as revision 3363 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Roman Shaposhnik
2004-07-28 21:56:59 +00:00
parent 668fe04e39
commit f5fc28d23c
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/gif.c
View File

@ -252,7 +252,7 @@ static int gif_image_write_image(ByteIOContext *pb,
gif_put_bits_rev(&p, 9, 0x0100); /* clear code */ gif_put_bits_rev(&p, 9, 0x0100); /* clear code */
for(i=0;i<GIF_CHUNKS;i++) { for(i=(left<GIF_CHUNKS)?left:GIF_CHUNKS;i;i--) {
if (pix_fmt == PIX_FMT_RGB24) { if (pix_fmt == PIX_FMT_RGB24) {
v = gif_clut_index(ptr[0], ptr[1], ptr[2]); v = gif_clut_index(ptr[0], ptr[1], ptr[2]);
ptr+=3; ptr+=3;
@ -276,12 +276,10 @@ static int gif_image_write_image(ByteIOContext *pb,
put_buffer(pb, p.buf, pbBufPtr(&p) - p.buf); /* the actual buffer */ put_buffer(pb, p.buf, pbBufPtr(&p) - p.buf); /* the actual buffer */
p.buf_ptr = p.buf; /* dequeue the bytes off the bitstream */ p.buf_ptr = p.buf; /* dequeue the bytes off the bitstream */
} }
if(left<=GIF_CHUNKS) {
put_byte(pb, 0x00); /* end of image block */
}
left-=GIF_CHUNKS; left-=GIF_CHUNKS;
} }
put_byte(pb, 0x00); /* end of image block */
return 0; return 0;
} }

4
tests/libav.regression.ref
View File

@ -37,8 +37,8 @@ b28918de1199e60a7ac235eefacb7d3b *./data/b-libav.dv
0c5fe86621b7377705837f304d4ba1e9 *./data/b-libav.ppm 0c5fe86621b7377705837f304d4ba1e9 *./data/b-libav.ppm
7603575 ./data/b-libav.ppm 7603575 ./data/b-libav.ppm
./data/b-libav.ppm CRC=b2bb8e92 ./data/b-libav.ppm CRC=b2bb8e92
1cac531652ea2ff2fb141d5ae992caa8 *./data/b-libav.gif 88a98269295fbfce7816558ad84e1259 *./data/b-libav.gif
2907057 ./data/b-libav.gif 2906382 ./data/b-libav.gif
c39dd19b88f9e0f03a318b51c37edb61 *./data/b-libav.yuv4mpeg c39dd19b88f9e0f03a318b51c37edb61 *./data/b-libav.yuv4mpeg
3801810 ./data/b-libav.yuv4mpeg 3801810 ./data/b-libav.yuv4mpeg
./data/b-libav%d.pgm CRC=84c09106 ./data/b-libav%d.pgm CRC=84c09106