aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/tiff.c
diff options
context:
space:
mode:
authorKostya Shishkov <kostya.shishkov@gmail.com>2008-12-17 17:39:35 +0000
committerKostya Shishkov <kostya.shishkov@gmail.com>2008-12-17 17:39:35 +0000
commit6a4583e92501356c41029dc35092c93126e05018 (patch)
tree55fd4c239700b7ab2a5f981614fc027e7fb51153 /libavcodec/tiff.c
parent124c21d79f2124d028890022e98ea853a834a964 (diff)
downloadffmpeg-6a4583e92501356c41029dc35092c93126e05018.tar.gz
4l: TIFF stores short strings inside tag, do not interpret it is as an offset
Fixes issue 753 Originally committed as revision 16189 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/tiff.c')
-rw-r--r--libavcodec/tiff.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c
index 7e42aabcbd..7e789b4759 100644
--- a/libavcodec/tiff.c
+++ b/libavcodec/tiff.c
@@ -176,6 +176,11 @@ static int tiff_decode_tag(TiffContext *s, const uint8_t *start, const uint8_t *
value = off;
buf = NULL;
break;
+ case TIFF_STRING:
+ if(count <= 4){
+ buf -= 4;
+ break;
+ }
default:
value = -1;
buf = start + off;