virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avcodec/tiff: avoid seek back on reading tags

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-08-09 14:53:13 +02:00
parent c94f9e8542
commit a9553e8f37
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavcodec/tiff.c
View File

@ -705,8 +705,7 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame)
tag = tget_short(&s->gb, s->le); tag = tget_short(&s->gb, s->le);
type = tget_short(&s->gb, s->le); type = tget_short(&s->gb, s->le);
count = tget_long(&s->gb, s->le); count = tget_long(&s->gb, s->le);
off = tget_long(&s->gb, s->le); start = bytestream2_tell(&s->gb) + 4;
start = bytestream2_tell(&s->gb);
if (type == 0 || type >= FF_ARRAY_ELEMS(type_sizes)) { if (type == 0 || type >= FF_ARRAY_ELEMS(type_sizes)) {
av_log(s->avctx, AV_LOG_DEBUG, "Unknown tiff type (%u) encountered\n", av_log(s->avctx, AV_LOG_DEBUG, "Unknown tiff type (%u) encountered\n",
@ -718,26 +717,26 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame)
switch (type) { switch (type) {
case TIFF_BYTE: case TIFF_BYTE:
case TIFF_SHORT: case TIFF_SHORT:
bytestream2_seek(&s->gb, -4, SEEK_CUR);
value = tget(&s->gb, type, s->le); value = tget(&s->gb, type, s->le);
break; break;
case TIFF_LONG: case TIFF_LONG:
off = tget_long(&s->gb, s->le);
value = off; value = off;
break; break;
case TIFF_STRING: case TIFF_STRING:
if (count <= 4) { if (count <= 4) {
bytestream2_seek(&s->gb, -4, SEEK_CUR);
break; break;
} }
default: default:
off = tget_long(&s->gb, s->le);
value = UINT_MAX; value = UINT_MAX;
bytestream2_seek(&s->gb, off, SEEK_SET); bytestream2_seek(&s->gb, off, SEEK_SET);
} }
} else { } else {
if (count <= 4 && type_sizes[type] * count <= 4) if (count > 4 || type_sizes[type] * count > 4) {
bytestream2_seek(&s->gb, -4, SEEK_CUR); off = tget_long(&s->gb, s->le);
else
bytestream2_seek(&s->gb, off, SEEK_SET); bytestream2_seek(&s->gb, off, SEEK_SET);
}
} }
switch (tag) { switch (tag) {