diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-09 16:53:13 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-09 16:53:13 +0400 |
| commit | a9553e8f37926e9b71d87cb08b1f4a2e7bb60097 (patch) | |
| tree | 581d2ee7b178d127803990e3aba8711f6ac8b22b /libavcodec/tiff.c | |
| parent | c94f9e854228e0ea00e1de8769d8d3f7cab84a55 (diff) | |
avcodec/tiff: avoid seek back on reading tags
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/tiff.c')
| -rw-r--r-- | libavcodec/tiff.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index fdfa8f2b9e..483225dc1e 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -705,8 +705,7 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame) tag = tget_short(&s->gb, s->le); type = tget_short(&s->gb, s->le); count = tget_long(&s->gb, s->le); - off = tget_long(&s->gb, s->le); - start = bytestream2_tell(&s->gb); + start = bytestream2_tell(&s->gb) + 4; if (type == 0 || type >= FF_ARRAY_ELEMS(type_sizes)) { 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) { case TIFF_BYTE: case TIFF_SHORT: - bytestream2_seek(&s->gb, -4, SEEK_CUR); value = tget(&s->gb, type, s->le); break; case TIFF_LONG: + off = tget_long(&s->gb, s->le); value = off; break; case TIFF_STRING: if (count <= 4) { - bytestream2_seek(&s->gb, -4, SEEK_CUR); break; } default: + off = tget_long(&s->gb, s->le); value = UINT_MAX; bytestream2_seek(&s->gb, off, SEEK_SET); } } else { - if (count <= 4 && type_sizes[type] * count <= 4) - bytestream2_seek(&s->gb, -4, SEEK_CUR); - else + if (count > 4 || type_sizes[type] * count > 4) { + off = tget_long(&s->gb, s->le); bytestream2_seek(&s->gb, off, SEEK_SET); + } } switch (tag) { |