Initialize a non-empty PNG ICC profile name

Exiv2 · Sep 15, 2022 · 7715493 · 7715493
1 parent d2253c9
commit 7715493
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/include/exiv2/pngimage.hpp b/include/exiv2/pngimage.hpp
@@ -79,7 +79,7 @@ class EXIV2API PngImage : public Image {
   void doWriteMetadata(BasicIo& outIo);
   //@}
 
-  std::string profileName_;
+  std::string profileName_{"ICC Profile"};
 
 };  // class PngImage
 

diff --git a/src/pngimage.cpp b/src/pngimage.cpp
@@ -447,13 +447,16 @@ void PngImage::readMetadata() {
           enforce(iccOffset < 80 && iccOffset < chunkLength, Exiv2::ErrorCode::kerCorruptedMetadata);
         } while (chunkData.read_uint8(iccOffset++) != 0x00);
 
-        profileName_ = std::string(chunkData.c_str(), iccOffset - 1);
+        // Don't fail on empty ICC profile name, but also don't overwrite the default
+        std::string profileName = std::string(chunkData.c_str(), iccOffset - 1);
+        if (profileName.size() > 0)
+          profileName_ = profileName;
         ++iccOffset;  // +1 = 'compressed' flag
         enforce(iccOffset <= chunkLength, Exiv2::ErrorCode::kerCorruptedMetadata);
 
         zlibToDataBuf(chunkData.c_data(iccOffset), static_cast<uLongf>(chunkLength - iccOffset), iccProfile_);
 #ifdef EXIV2_DEBUG_MESSAGES
-        std::cout << "Exiv2::PngImage::readMetadata: profile name: " << profileName_ << std::endl;
+        std::cout << "Exiv2::PngImage::readMetadata: profile name: " << profileName << std::endl;
         std::cout << "Exiv2::PngImage::readMetadata: iccProfile.size_ (uncompressed) : " << iccProfile_.size()
                   << std::endl;
 #endif