Remove unused condition and fix buffer overflow

Change-Id: Id1d0a7de85d5251c90f0b3df80ce6c5b662d1622
Signed-off-by: Jiyong Min <jiyong.min@samsung.com>

diff --git a/utils/mm_file_util_tag.c b/utils/mm_file_util_tag.c
index 62a011b..4e52dd1 100755 (executable)
--- a/utils/mm_file_util_tag.c
+++ b/utils/mm_file_util_tag.c
@@ -1793,11 +1793,6 @@ bool mm_file_id3tag_parse_v222(AvFileContentInfo *pInfo, unsigned char *buffer)
                                        textEncodingType = AV_ID3V2_UTF16;
                                }
 
-                               if (textEncodingType > AV_ID3V2_MAX) {
-                                       debug_msg("WRONG ENCOIDNG TYPE [%d], FRAME[%s]\n", textEncodingType, (char *)CompTmp);
-                                       continue;
-                               }
-
                                /*in order to deliver valid string to MP */
                                while ((buffer[curPos - purelyFramelen + encodingOffSet] < 0x20) && (encodingOffSet < purelyFramelen))
                                        encodingOffSet++;
@@ -2468,7 +2463,7 @@ bool mm_file_id3tag_parse_v223(AvFileContentInfo *pInfo, unsigned char *buffer)
                                                                                                                        if (synclyrics_info->lyric_info != NULL) {
                                                                                                                                memset(synclyrics_info->lyric_info, 0, copy_len + 1);
                                                                                                                                memcpy(synclyrics_info->lyric_info, pExtContent + copy_start_pos, copy_len);
-                                                                                                                               synclyrics_info->lyric_info[copy_len + 1] = '\0';
+                                                                                                                               synclyrics_info->lyric_info[copy_len] = '\0';
                                                                                                                        }
                                                                                                                } else {
                                                                                                                        synclyrics_info->lyric_info = mmfile_string_convert((const char *)&pExtContent[copy_start_pos], copy_len, "UTF-8", charset_array[AV_ID3V2_ISO_8859], NULL, NULL);
@@ -3259,7 +3254,7 @@ bool mm_file_id3tag_parse_v224(AvFileContentInfo *pInfo, unsigned char *buffer)
                                                                                                        if (synclyrics_info->lyric_info) {
                                                                                                                memset(synclyrics_info->lyric_info, 0, copy_len + 1);
                                                                                                                memcpy(synclyrics_info->lyric_info, pExtContent + copy_start_pos, copy_len);
-                                                                                                               synclyrics_info->lyric_info[copy_len + 1] = '\0';
+                                                                                                               synclyrics_info->lyric_info[copy_len] = '\0';
                                                                                                        }
                                                                                                } else {
                                                                                                        synclyrics_info->lyric_info = mmfile_string_convert((const char *)&pExtContent[copy_start_pos], copy_len, "UTF-8", charset_array[textEncodingType], NULL, NULL);