From b88a57eeceda57e27c71e30604e1e8e785c2dc83 Mon Sep 17 00:00:00 2001 From: duanhan Date: Mon, 11 Nov 2024 15:18:17 +0800 Subject: [PATCH] 1111 libexif codecheck Signed-off-by: duanhan --- README.OpenSource | 4 ++-- libexif/huawei/exif-mnote-data-huawei.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.OpenSource b/README.OpenSource index 47832b8..5c48ea4 100644 --- a/README.OpenSource +++ b/README.OpenSource @@ -1,9 +1,9 @@ [ { - "Name": "libexif", + "Name": "EXIF Tag Parsing Library - libexif", "License": "LGPL-2.1+", "License File": "COPYING", - "Version Number": "0.6.24", + "Version Number": "v0.6.24", "Upstream URL": "https://github.com/libexif/libexif/releases/tag/v0.6.24", "Description": "The exif base library" } diff --git a/libexif/huawei/exif-mnote-data-huawei.c b/libexif/huawei/exif-mnote-data-huawei.c index 182a906..d59556e 100644 --- a/libexif/huawei/exif-mnote-data-huawei.c +++ b/libexif/huawei/exif-mnote-data-huawei.c @@ -95,7 +95,7 @@ exif_mnote_data_huawei_set_offset (ExifMnoteData *n, unsigned int o) static void exif_mnote_data_huawei_malloc_size_data (ExifMnoteData *ne, unsigned int *malloc_size) { - + if (!ne) return; ExifMnoteDataHuawei *n = (ExifMnoteDataHuawei *) ne; if (!n) { exif_log (ne->log, EXIF_LOG_CODE_CORRUPT_DATA, "ExifMnoteHuawei", "n is NULL"); @@ -370,6 +370,7 @@ exif_mnote_data_huawei_load_data (ExifMnoteData *ne, const unsigned char *buf, u static void exif_mnote_data_huawei_load (ExifMnoteData *ne, const unsigned char *buf, unsigned int buf_size) { + if (!ne) return; unsigned int head_offset = 6; ExifMnoteDataHuawei *n = (ExifMnoteDataHuawei *) ne; if (!n || !buf || !buf_size) { @@ -666,14 +667,13 @@ exif_mnote_data_add_entry (ExifMnoteData *ne, MnoteHuaweiEntry *e) ExifMnoteDataHuawei *n = (ExifMnoteDataHuawei *) ne; MnoteHuaweiEntry *find_entry = NULL, *add_entry=NULL; ExifMnoteDataHuawei *parent_md = NULL; - MnoteHuaweiTag owner_tag = get_tag_owner_tag(e->tag); MnoteHuaweiEntryCount *ec = NULL; if(!is_huawei_md(ne) || (n->ifd_tag != MNOTE_HUAWEI_INFO) || !e) { ret = -1; goto Failed; } - + MnoteHuaweiTag owner_tag = get_tag_owner_tag(e->tag); if (owner_tag == MNOTE_HUAWEI_INFO) parent_md = n; mnote_huawei_get_entry_count(n, &ec); @@ -734,7 +734,7 @@ exif_mnote_data_remove_entry (ExifMnoteData *ne, MnoteHuaweiEntry *e) return; MnoteHuaweiEntry *find_entry = exif_mnote_data_huawei_get_entry_by_tag(n, e->tag); - if (find_entry != e) + if (find_entry != e || !find_entry) return; ExifMnoteDataHuawei *parent_md = find_entry->parent_md;