From 586c4ba9cef3a590ddb061c9dcace2724abb0043 Mon Sep 17 00:00:00 2001 From: Haejeong Kim Date: Mon, 21 Dec 2015 17:11:37 +0900 Subject: [PATCH] Svace issue fix Change-Id: Ia8a53323c9680cbddac59ffc2d73268c785066e8 --- formats/ffmpeg/mm_file_format_ffmpeg.c | 11 +++++++---- formats/ffmpeg/mm_file_format_mp3.c | 6 ++---- packaging/libmm-fileinfo.spec | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/formats/ffmpeg/mm_file_format_ffmpeg.c b/formats/ffmpeg/mm_file_format_ffmpeg.c index 782fa7c..3a4b2e2 100755 --- a/formats/ffmpeg/mm_file_format_ffmpeg.c +++ b/formats/ffmpeg/mm_file_format_ffmpeg.c @@ -865,9 +865,9 @@ static unsigned int _diff_memory(const void *s1, const void *s2, unsigned int n) { char *s = (char *)s1; char *d = (char *)s2; - unsigned int i; - unsigned int ret; - int tmp; + unsigned int i = 0; + unsigned int ret = 0; + int tmp = 0; for (i = 0, ret = 0; i < n; i++) { if (*s++ != *d++) { @@ -875,7 +875,10 @@ static unsigned int _diff_memory(const void *s1, const void *s2, unsigned int n) ret += (tmp < 0 ? -tmp : tmp); } } - ret /= n; + + if (n != 0) + ret /= n; + return ret; } diff --git a/formats/ffmpeg/mm_file_format_mp3.c b/formats/ffmpeg/mm_file_format_mp3.c index 5e52b93..08eac0c 100755 --- a/formats/ffmpeg/mm_file_format_mp3.c +++ b/formats/ffmpeg/mm_file_format_mp3.c @@ -876,9 +876,7 @@ __AvFindStartOfMp3Header(MMFileIOHandle *hFile, unsigned char *buf, AvFileConte bool bFoundSync = false; unsigned long minLen; - - - if (pInfo->fileLen > (_AV_MP3_HEADER_POSITION_MAX + pInfo->tagV2Info.tagLen)) + if (pInfo->fileLen > (long long)(_AV_MP3_HEADER_POSITION_MAX + pInfo->tagV2Info.tagLen)) bufLen = _AV_MP3_HEADER_POSITION_MAX; else bufLen = pInfo->fileLen - pInfo->tagV2Info.tagLen; @@ -1163,7 +1161,7 @@ static int mmf_file_mp3_get_infomation(char *filename, AvFileContentInfo *pInfo) debug_msg("pInfo->fileLen(%lld)\n", pInfo->fileLen); #endif - if (pInfo->fileLen > (_AV_MP3_HEADER_POSITION_MAX + pInfo->tagV2Info.tagLen)) { + if (pInfo->fileLen > (long long)(_AV_MP3_HEADER_POSITION_MAX + pInfo->tagV2Info.tagLen)) { readAmount = _AV_MP3_HEADER_POSITION_MAX + pInfo->tagV2Info.tagLen; buf = mmfile_malloc(readAmount); if (buf == NULL) { diff --git a/packaging/libmm-fileinfo.spec b/packaging/libmm-fileinfo.spec index 9a160d4..c73e05f 100755 --- a/packaging/libmm-fileinfo.spec +++ b/packaging/libmm-fileinfo.spec @@ -1,6 +1,6 @@ Name: libmm-fileinfo Summary: Media Fileinfo -Version: 0.6.40 +Version: 0.6.41 Release: 0 Group: System/Libraries License: Apache-2.0 -- 2.7.4