Fix false positive -Wnull-dereference warning with gcc 13.1.1 of Alpine

rouault · Oct 5, 2023 · a38fb95 · a38fb95
1 parent b54ad56
commit a38fb95
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/gcore/gdaljp2box.cpp b/gcore/gdaljp2box.cpp
@@ -574,10 +574,11 @@ GDALJP2Box *GDALJP2Box::CreateJUMBFBox(const GDALJP2Box *poJUMBFDescriptionBox,
                                        int nCount,
                                        const GDALJP2Box *const *papoBoxes)
 {
-    std::vector<const GDALJP2Box *> apoBoxes(1 + nCount);
-    apoBoxes[0] = poJUMBFDescriptionBox;
-    memcpy(&apoBoxes[1], papoBoxes, nCount * sizeof(GDALJP2Box *));
-    return CreateSuperBox("jumb", 1 + nCount, apoBoxes.data());
+    std::vector<const GDALJP2Box *> apoBoxes;
+    apoBoxes.push_back(poJUMBFDescriptionBox);
+    apoBoxes.insert(apoBoxes.end(), papoBoxes, papoBoxes + nCount);
+    return CreateSuperBox("jumb", static_cast<int>(apoBoxes.size()),
+                          apoBoxes.data());
 }
 
 /*! @endcond */