RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

tiff: continue parsing on non fatal errors 

Reviewed-by: Thilo Borgmann <thilo.borgmann@mail.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-08-11 14:16:09 +02:00
parent 8e119a22c4
commit 61e0e80999
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/tiff.c
View File

@ -710,7 +710,7 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame)
if (type == 0 || type >= FF_ARRAY_ELEMS(type_sizes)) {
av_log(s->avctx, AV_LOG_DEBUG, "Unknown tiff type (%u) encountered\n",
type);
return 0;
goto end;
}
if (count == 1) {
@ -928,7 +928,7 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame)
#define ADD_METADATA(count, name, sep)\
if ((ret = add_metadata(count, type, name, sep, s, frame)) < 0) {\
av_log(s->avctx, AV_LOG_ERROR, "Error allocating temporary buffer\n");\
return ret;\
goto end;\
}
case TIFF_MODEL_PIXEL_SCALE:
ADD_METADATA(count, "ModelPixelScaleTag", NULL);
@ -955,7 +955,7 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame)
if (!s->geotags) {
av_log(s->avctx, AV_LOG_ERROR, "Error allocating temporary buffer\n");
s->geotag_count = 0;
return AVERROR(ENOMEM);
goto end;
}
for (i = 0; i < s->geotag_count; i++) {
s->geotags[i].key = tget_short(&s->gb, s->le);
@ -976,7 +976,7 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame)
dp = av_malloc(count * sizeof(double));
if (!dp) {
av_log(s->avctx, AV_LOG_ERROR, "Error allocating temporary buffer\n");
return AVERROR(ENOMEM);
goto end;
}
for (i = 0; i < count; i++)
dp[i] = tget_double(&s->gb, s->le);
@ -1064,6 +1064,7 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame)
return AVERROR_INVALIDDATA;
}
}
end:
bytestream2_seek(&s->gb, start, SEEK_SET);
return 0;
}