From d54dc58308dccbc1dc0829a87de1e0fda0306f0a Mon Sep 17 00:00:00 2001 From: Vitaliy Cherepanov Date: Fri, 8 Dec 2017 15:03:19 +0300 Subject: [PATCH] Fix deadlock during extracting tags Change-Id: I16fe8b3844ace9be1edce741de533b40362ab4d6 Signed-off-by: Vitaliy Cherepanov --- utils/mm_file_util_tag.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/utils/mm_file_util_tag.c b/utils/mm_file_util_tag.c index 8802cfa..6bfa64e 100755 --- a/utils/mm_file_util_tag.c +++ b/utils/mm_file_util_tag.c @@ -2148,7 +2148,14 @@ EXPORT_API int MMFileUtilGetMetaDataFromMP4(MMFileFormatContext *formatContext) goto exit; } - basic_header.start_offset = mmfile_tell(fp); + long long new_pos = mmfile_tell(fp); + + if ((moov_end == 0) && (new_pos <= basic_header.start_offset)) { + ret = MMFILE_UTIL_FAIL; + continue; + } + basic_header.start_offset = new_pos; + } exit: -- 2.7.4