From c34b5c57a775655ac4aacfec5ac77dfaf290f30c Mon Sep 17 00:00:00 2001 From: Jiyong Min Date: Mon, 13 Dec 2021 13:15:25 +0900 Subject: [PATCH] replace g_memdup() to g_memdup2() - g_memdup() was removed in glib2 Change-Id: Ie7926df9ab37b70ba6ee7fafa7de865a8198e1bc --- formats/ffmpeg/mm_file_format_aac.c | 2 +- formats/ffmpeg/mm_file_format_ffmpeg.c | 4 ++-- formats/ffmpeg/mm_file_format_imelody.c | 2 +- formats/ffmpeg/mm_file_format_mp3.c | 2 +- mm_file.c | 4 ++-- packaging/libmm-fileinfo.spec | 2 +- utils/mm_file_util_tag.c | 8 ++++---- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/formats/ffmpeg/mm_file_format_aac.c b/formats/ffmpeg/mm_file_format_aac.c index 4bcc771..f0bf719 100644 --- a/formats/ffmpeg/mm_file_format_aac.c +++ b/formats/ffmpeg/mm_file_format_aac.c @@ -715,7 +715,7 @@ int mmfile_format_read_tag_aac(MMFileFormatContext *formatContext) formatContext->artworkMime = g_strdup(aacinfo.artworkMime); if (aacinfo.artwork) { formatContext->artworkSize = aacinfo.artworkSize; - formatContext->artwork = g_memdup(aacinfo.artwork, aacinfo.artworkSize); + formatContext->artwork = g_memdup2(aacinfo.artwork, aacinfo.artworkSize); } #ifdef __MMFILE_TEST_MODE__ diff --git a/formats/ffmpeg/mm_file_format_ffmpeg.c b/formats/ffmpeg/mm_file_format_ffmpeg.c index 0ba3a7d..634da17 100644 --- a/formats/ffmpeg/mm_file_format_ffmpeg.c +++ b/formats/ffmpeg/mm_file_format_ffmpeg.c @@ -638,7 +638,7 @@ static void __fill_picture_in_context(char *value, MMFileFormatContext *formatCo current_pos += DATA_LENGTH; mmfile_free(formatContext->artwork); - formatContext->artwork = g_memdup(meta_data + current_pos, formatContext->artworkSize); + formatContext->artwork = g_memdup2(meta_data + current_pos, formatContext->artworkSize); g_free(meta_data); } @@ -666,7 +666,7 @@ static void __fill_artwork_in_context(AVStream *st, MMFileFormatContext *formatC mmfile_free(formatContext->artwork); formatContext->artworkSize = pkt.size; - formatContext->artwork = g_memdup(pkt.data, pkt.size); + formatContext->artwork = g_memdup2(pkt.data, pkt.size); } static void __fill_metainfo_in_context(AVDictionary *metainfo, MMFileFormatContext *formatContext) diff --git a/formats/ffmpeg/mm_file_format_imelody.c b/formats/ffmpeg/mm_file_format_imelody.c index 0efa56f..3dab94e 100755 --- a/formats/ffmpeg/mm_file_format_imelody.c +++ b/formats/ffmpeg/mm_file_format_imelody.c @@ -939,7 +939,7 @@ static unsigned char * __AvConvertIMelody2MIDI(char *pMelodyBuf, unsigned int *p *pBufLen = 6 * (count + (noteCount - count)) + 56 - 1; - return g_memdup(midiData, *pBufLen); + return g_memdup2(midiData, *pBufLen); } static int __get_imelody_tag(const char *uriname, tMMFileImelodyTagInfo *tags) diff --git a/formats/ffmpeg/mm_file_format_mp3.c b/formats/ffmpeg/mm_file_format_mp3.c index 460b338..99d8dfe 100644 --- a/formats/ffmpeg/mm_file_format_mp3.c +++ b/formats/ffmpeg/mm_file_format_mp3.c @@ -158,7 +158,7 @@ int mmfile_format_read_tag_mp3(MMFileFormatContext *formatContext) if (privateData->imageInfo.imageLen > 0) { formatContext->artworkSize = privateData->imageInfo.imageLen; - formatContext->artwork = g_memdup(privateData->imageInfo.pImageBuf, privateData->imageInfo.imageLen); + formatContext->artwork = g_memdup2(privateData->imageInfo.pImageBuf, privateData->imageInfo.imageLen); if (strlen(privateData->imageInfo.imageMIMEType) > 0) formatContext->artworkMime = g_strdup(privateData->imageInfo.imageMIMEType); diff --git a/mm_file.c b/mm_file.c index 1ecec7d..fad02ee 100644 --- a/mm_file.c +++ b/mm_file.c @@ -310,7 +310,7 @@ static int _info_set_attr_media(MMHandleType attrs, MMFileFormatContext *formatC mm_attrs_set_string_by_name(attrs, MM_FILE_TAG_UNSYNCLYRICS, formatContext->unsyncLyrics); if (formatContext->artwork && formatContext->artworkSize > 0) { - void *artworkCopy = g_memdup(formatContext->artwork, formatContext->artworkSize); + void *artworkCopy = g_memdup2(formatContext->artwork, formatContext->artworkSize); mm_attrs_set_data_by_name(attrs, MM_FILE_TAG_ARTWORK, artworkCopy, formatContext->artworkSize); mm_attrs_set_int_by_name(attrs, MM_FILE_TAG_ARTWORK_SIZE, formatContext->artworkSize); @@ -337,7 +337,7 @@ static int _info_set_attr_media(MMHandleType attrs, MMFileFormatContext *formatC if (formatContext->thumbNail && formatContext->thumbNail->frameData) { void *thumbNailCopy = NULL; - thumbNailCopy = g_memdup(formatContext->thumbNail->frameData, formatContext->thumbNail->frameSize); + thumbNailCopy = g_memdup2(formatContext->thumbNail->frameData, formatContext->thumbNail->frameSize); mm_attrs_set_data_by_name(attrs, MM_FILE_CONTENT_VIDEO_THUMBNAIL, thumbNailCopy, formatContext->thumbNail->frameSize); mm_attrs_set_int_by_name(attrs, MM_FILE_CONTENT_VIDEO_WIDTH, formatContext->thumbNail->frameWidth); diff --git a/packaging/libmm-fileinfo.spec b/packaging/libmm-fileinfo.spec index 3a26d86..a8a8eae 100644 --- a/packaging/libmm-fileinfo.spec +++ b/packaging/libmm-fileinfo.spec @@ -1,6 +1,6 @@ Name: libmm-fileinfo Summary: Media Fileinfo -Version: 1.0.8 +Version: 1.0.9 Release: 0 Group: System/Libraries License: Apache-2.0 diff --git a/utils/mm_file_util_tag.c b/utils/mm_file_util_tag.c index 8d0f399..1251f77 100644 --- a/utils/mm_file_util_tag.c +++ b/utils/mm_file_util_tag.c @@ -1750,7 +1750,7 @@ static int GetTagFromMetaBox(MMFileFormatContext *formatContext, MMFileIOHandle if (tagInfo.imageInfo.pImageBuf && tagInfo.imageInfo.imageLen > 0) { formatContext->artworkSize = tagInfo.imageInfo.imageLen; - formatContext->artwork = g_memdup(tagInfo.imageInfo.pImageBuf, tagInfo.imageInfo.imageLen); + formatContext->artwork = g_memdup2(tagInfo.imageInfo.pImageBuf, tagInfo.imageInfo.imageLen); } mm_file_free_AvFileContentInfo(&tagInfo); @@ -2561,7 +2561,7 @@ static void __id3tag_parse_SYLT(AvFileContentInfo *pInfo, unsigned char *pTagVal if (pTagVal[offset + idx] == 0x00) { synclyrics_info = g_new0(AvSynclyricsInfo, 1); if (textEncodingType == AV_ID3V2_UTF8) - synclyrics_info->lyric_info = g_memdup(pTagVal + copy_start_pos, copy_len + 1); + synclyrics_info->lyric_info = g_memdup2(pTagVal + copy_start_pos, copy_len + 1); else synclyrics_info->lyric_info = mmfile_convert_to_utf8((const char *)&pTagVal[copy_start_pos], copy_len, pCharSet); @@ -2688,7 +2688,7 @@ static void __id3tag_parse_APIC_desc(AvFileContentInfo *pInfo, unsigned char *pT tag_len = idx + 1; /* length of description + '\0' */ - tmp_desc = g_memdup(pTagVal + *offset, tag_len); + tmp_desc = g_memdup2(pTagVal + *offset, tag_len); /* convert description */ pInfo->imageInfo.imageDescription = mmfile_convert_to_utf8(tmp_desc, tag_len, pCharSet); @@ -2721,7 +2721,7 @@ static void __id3tag_parse_APIC_picture(AvFileContentInfo *pInfo, unsigned char } pInfo->imageInfo.imageLen = nTagLen - *offset; - pInfo->imageInfo.pImageBuf = g_memdup(pTagVal + *offset, pInfo->imageInfo.imageLen); + pInfo->imageInfo.pImageBuf = g_memdup2(pTagVal + *offset, pInfo->imageInfo.imageLen); /* if mimetype is "-->", image date has an URL */ if (IS_INCLUDE_URL(pInfo->imageInfo.imageMIMEType)) -- 2.7.4