Avoid Sonar warnings about unsafe use of strlen

Signed-off-by: Larry Gritz <lg@larrygritz.com>

Author: lgritz

src/jpeg.imageio/jpegoutput.cpp

@@ -290,9 +290,9 @@ JpgOutput::open(const std::string& name, const ImageSpec& newspec,
     std::vector<char> iptc;
     if (m_spec.get_int_attribute("jpeg:iptc", 1)
         && encode_iptc_iim(m_spec, iptc)) {
-        static char photoshop[] = "Photoshop 3.0";
+        static const char* photoshop = "Photoshop 3.0";
         std::vector<char> head(photoshop, photoshop + strlen(photoshop) + 1);
-        static char _8BIM[] = "8BIM";
+        static const char* _8BIM = "8BIM";
         head.insert(head.end(), _8BIM, _8BIM + 4);
         head.push_back(4);  // 0x0404
         head.push_back(4);
@@ -310,7 +310,7 @@ JpgOutput::open(const std::string& name, const ImageSpec& newspec,
     // Write XMP packet, if we have anything
     std::string xmp = encode_xmp(m_spec, true);
     if (!xmp.empty()) {
-        static char prefix[] = "http://ns.adobe.com/xap/1.0/";  //NOSONAR
+        static const char* prefix = "http://ns.adobe.com/xap/1.0/";
         std::vector<char> block(prefix, prefix + strlen(prefix) + 1);
         block.insert(block.end(), xmp.c_str(), xmp.c_str() + xmp.length());
         jpeg_write_marker(&m_cinfo, JPEG_APP0 + 1, (JOCTET*)&block[0],

src/libOpenImageIO/exif.cpp

@@ -737,8 +737,10 @@ add_exif_item_to_spec(ImageSpec& spec, const char* name,
         while (dspan.size() && dspan.back() == 0)
             dspan = dspan.subspan(0, dspan.size() - 1);
         std::string str(dspan.begin(), dspan.end());
-        if (strlen(str.c_str()) < str.length())  // Stray \0 in the middle
+        if (Strutil::safe_strlen(str.c_str(), str.length()) < str.length()) {
+            // Stray \0 in the middle
             str = std::string(str.c_str());
+        }
         spec.attribute(name, str);
         return;
     }