summaryrefslogtreecommitdiff
path: root/libavcodec/tiff.c
diff options
context:
space:
mode:
authorKostya Shishkov <kostya.shishkov@gmail.com>2009-10-01 06:31:49 +0000
committerKostya Shishkov <kostya.shishkov@gmail.com>2009-10-01 06:31:49 +0000
commita8b95021e5c500c9d8fb56eb9d16260f508321d7 (patch)
tree61e0bb20649a5edc6ddc4900e312520dadc2d3f5 /libavcodec/tiff.c
parent8355572f91b0d2c423690345547006037e316d3b (diff)
Do not attempt to decode TIFF files containing fax data with uncompressed
mode allowed for there is no code to decode it (yet). Originally committed as revision 20114 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 27dd464f43..8818a66530 100644
--- a/libavcodec/tiff.c
+++ b/libavcodec/tiff.c
@@ -139,6 +139,11 @@ static int tiff_unpack_strip(TiffContext *s, uint8_t* dst, int stride, const uin
av_log(s->avctx, AV_LOG_ERROR, "Error allocating temporary buffer\n");
return -1;
}
+ if(s->fax_opts & 2){
+ av_log(s->avctx, AV_LOG_ERROR, "Uncompressed fax mode is not supported (yet)\n");
+ av_free(src2);
+ return -1;
+ }
if(!s->fill_order){
memcpy(src2, src, size);
}else{