cppcheck fixes

OSGeo · Mar 4, 2025 · 0ff0ab5 · 0ff0ab5
1 parent 144e7d1
commit 0ff0ab5
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/frmts/msg/xritheaderparser.cpp b/frmts/msg/xritheaderparser.cpp
@@ -42,16 +42,20 @@ XRITHeaderParser::XRITHeaderParser(std::ifstream &ifile)
         {
             unsigned char *buf =
                 (unsigned char *)std::malloc(totalHeaderLength);
-            std::memcpy(
-                buf, probeBuf,
-                probeSize);  // save what we have already read when probing
-            ifile.read((char *)buf + probeSize,
-                       totalHeaderLength -
-                           probeSize);  // read the rest of the header section
-            parseHeader(buf, totalHeaderLength);
-            std::free(buf);
-
-            m_isValid = true;
+            if (buf)
+            {
+                std::memcpy(
+                    buf, probeBuf,
+                    probeSize);  // save what we have already read when probing
+                ifile.read(
+                    (char *)buf + probeSize,
+                    totalHeaderLength -
+                        probeSize);  // read the rest of the header section
+                parseHeader(buf, totalHeaderLength);
+                std::free(buf);
+
+                m_isValid = true;
+            }
         }
     }
 

diff --git a/scripts/cppcheck.sh b/scripts/cppcheck.sh
@@ -111,6 +111,7 @@ for dirname in alg port gcore ogr frmts gnm apps fuzzers; do
         -DPCIDSK_FRMT_UINT64="\"%llu\"" \
         -DGNMGFIDFormat="\"%lld\"" \
         -DGDAL_RELEASE_NAME="\"dummy\"" \
+        -DGDAL_RELEASE_NICKNAME="\"dummy\"" \
         "-DBANDMAP_TYPE=int*" \
         -DSQLITE_UTF8=1 \
         -DSQLITE_DETERMINISTIC=0x000000800 \