From 5e5c731c7d123480c6d9ed66fa0121ba7eb8fa48 Mon Sep 17 00:00:00 2001 From: "Eunki, Hong" Date: Thu, 10 Mar 2022 16:23:03 +0900 Subject: [PATCH] Fix coverity issue on jpeg loader : Add null check Add some null checker branch on loader-jpeg-turbo which can be nullptr Change-Id: I28d6a5c112ef8922beaf0597fc168d25d25465e1 Signed-off-by: Eunki, Hong --- dali/internal/imaging/common/loader-jpeg-turbo.cpp | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/dali/internal/imaging/common/loader-jpeg-turbo.cpp b/dali/internal/imaging/common/loader-jpeg-turbo.cpp index 7ed1d1c..83ce109 100644 --- a/dali/internal/imaging/common/loader-jpeg-turbo.cpp +++ b/dali/internal/imaging/common/loader-jpeg-turbo.cpp @@ -603,16 +603,19 @@ bool LoadBitmapFromJpeg(const Dali::ImageLoader::Input& input, Dali::Devel::Pixe std::unique_ptr exifMap; exifMap.reset(new Property::Map()); - for(auto k = 0u; k < EXIF_IFD_COUNT; ++k) + if(DALI_LIKELY(exifData)) { - auto content = exifData->ifd[k]; - for(auto i = 0u; i < content->count; ++i) + for(auto k = 0u; k < EXIF_IFD_COUNT; ++k) { - auto&& tag = content->entries[i]; - const char* shortName = exif_tag_get_name_in_ifd(tag->tag, static_cast(k)); - if(shortName) + auto content = exifData->ifd[k]; + for(auto i = 0u; i < content->count; ++i) { - AddExifFieldPropertyMap(*exifMap, *tag, static_cast(k)); + auto&& tag = content->entries[i]; + const char* shortName = exif_tag_get_name_in_ifd(tag->tag, static_cast(k)); + if(shortName) + { + AddExifFieldPropertyMap(*exifMap, *tag, static_cast(k)); + } } } } -- 2.7.4