Merge pull request #13455 from OSGeo/backport-13450-to-release/3.12

[Backport release/3.12] JPEG2000 writer: remove NUL terminated byte at end of payload of 'lbl ' and 'xml ' boxes

Author: rouault

autotest/gdrivers/data/jpeg2000/byte_lossless_openjp2_golden.jp2

@@ -488,7 +488,7 @@ GDALJP2Box *GDALJP2Box::CreateLblBox(const char *pszLabel)
 {
     GDALJP2Box *const poBox = new GDALJP2Box();
     poBox->SetType("lbl ");
-    poBox->SetWritableData(static_cast<int>(strlen(pszLabel) + 1),
+    poBox->SetWritableData(static_cast<int>(strlen(pszLabel)),
                            reinterpret_cast<const GByte *>(pszLabel));
 
     return poBox;
@@ -504,12 +504,12 @@ GDALJP2Box *GDALJP2Box::CreateLabelledXMLAssoc(const char *pszLabel,
 {
     GDALJP2Box oLabel;
     oLabel.SetType("lbl ");
-    oLabel.SetWritableData(static_cast<int>(strlen(pszLabel) + 1),
+    oLabel.SetWritableData(static_cast<int>(strlen(pszLabel)),
                            reinterpret_cast<const GByte *>(pszLabel));
 
     GDALJP2Box oXML;
     oXML.SetType("xml ");
-    oXML.SetWritableData(static_cast<int>(strlen(pszXML) + 1),
+    oXML.SetWritableData(static_cast<int>(strlen(pszXML)),
                          reinterpret_cast<const GByte *>(pszXML));
 
     GDALJP2Box *aoList[2] = {&oLabel, &oXML};
@@ -530,6 +530,8 @@ GDALJP2Box *GDALJP2Box::CreateJUMBFDescriptionBox(const GByte *pabyUUIDType,
 
     poBox->AppendWritableData(16, pabyUUIDType);
     poBox->AppendUInt8(3);  // requestable field
+    // +1 since NUL terminated byte required in the JUMBF spec
+    // cf other implementation at https://gitlab.com/wg1/jpeg-systems/reference-software/jumbf-reference-implementation-2/-/blame/main/dbench_jumbf/src/db_jumbf_desc_box.cpp?ref_type=heads#L169
     const size_t nLabelLen = strlen(pszLabel) + 1;
     poBox->AppendWritableData(static_cast<int>(nLabelLen), pszLabel);
 

gcore/gdaljp2box.cpp

@@ -217,10 +217,10 @@ void GDALJP2Metadata::CollectGMLData(GDALJP2Box *poGMLData)
 
             while (strlen(oSubChildBox.GetType()) > 0)
             {
-                if (EQUAL(oSubChildBox.GetType(), "lbl "))
+                if (EQUAL(oSubChildBox.GetType(), "lbl ") && !pszLabel)
                     pszLabel =
                         reinterpret_cast<char *>(oSubChildBox.ReadBoxData());
-                else if (EQUAL(oSubChildBox.GetType(), "xml "))
+                else if (EQUAL(oSubChildBox.GetType(), "xml ") && !pszXML)
                 {
                     pszXML =
                         reinterpret_cast<char *>(oSubChildBox.ReadBoxData());
@@ -3333,7 +3333,7 @@ GDALJP2Metadata::CreateGDALMultiDomainMetadataXMLBox(GDALDataset *poSrcDS,
 
     GDALJP2Box *poBox = new GDALJP2Box();
     poBox->SetType("xml ");
-    poBox->SetWritableData(static_cast<int>(strlen(pszXML) + 1),
+    poBox->SetWritableData(static_cast<int>(strlen(pszXML)),
                            reinterpret_cast<const GByte *>(pszXML));
     CPLFree(pszXML);
 
@@ -3362,7 +3362,7 @@ GDALJP2Box **GDALJP2Metadata::CreateXMLBoxes(GDALDataset *poSrcDS, int *pnBoxes)
                 GDALJP2Box *poBox = new GDALJP2Box();
                 poBox->SetType("xml ");
                 poBox->SetWritableData(
-                    static_cast<int>(strlen(*papszSrcMD) + 1),
+                    static_cast<int>(strlen(*papszSrcMD)),
                     reinterpret_cast<const GByte *>(*papszSrcMD));
                 papoBoxes = static_cast<GDALJP2Box **>(CPLRealloc(
                     papoBoxes, sizeof(GDALJP2Box *) * (*pnBoxes + 1)));
@@ -3385,7 +3385,7 @@ GDALJP2Box *GDALJP2Metadata::CreateXMPBox(GDALDataset *poSrcDS)
     if (papszSrcMD && *papszSrcMD)
     {
         poBox = GDALJP2Box::CreateUUIDBox(
-            xmp_uuid, static_cast<int>(strlen(*papszSrcMD) + 1),
+            xmp_uuid, static_cast<int>(strlen(*papszSrcMD)),
             reinterpret_cast<const GByte *>(*papszSrcMD));
     }
     return poBox;
@@ -3403,7 +3403,7 @@ GDALJP2Box *GDALJP2Metadata::CreateIPRBox(GDALDataset *poSrcDS)
     {
         poBox = new GDALJP2Box();
         poBox->SetType("jp2i");
-        poBox->SetWritableData(static_cast<int>(strlen(*papszSrcMD) + 1),
+        poBox->SetWritableData(static_cast<int>(strlen(*papszSrcMD)),
                                reinterpret_cast<const GByte *>(*papszSrcMD));
     }
     return poBox;