Merge pull request #971 from libexpat/address-cppcheck-warnings

Address Cppcheck warnings + fix Cppcheck CI

.github/workflows/cppcheck.yml

@@ -49,6 +49,8 @@ jobs:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  # v4.2.2
     - name: Install runtime dependencies
       run: |
+        set -x
+        brew update
         exec brew install cppcheck
     - name: Run Cppcheck
       run: |

.github/workflows/scripts/mass-cppcheck.sh

@@ -43,6 +43,7 @@ for xml_context_bytes in 0 1024; do
             --check-level=exhaustive
             --suppress=objectIndex
             --suppress=unknownMacro
+            '-D__has_attribute(x)=1'
             -DXML_CONTEXT_BYTES=${xml_context_bytes}
             -DXML_GE=${xml_ge}
         )

expat/Changes

@@ -53,6 +53,7 @@ Release 2.6.5 ??? ???????? ?? ????
                     for CMake
             #953  Windows: Address warning -Wunknown-warning-option
                     about -Wno-pedantic-ms-format from LLVM MinGW
+            #971  Address Cppcheck warnings
 
         Infrastructure:
             #926  tests: Increase robustness
@@ -71,6 +72,7 @@ Release 2.6.5 ??? ???????? ?? ????
                       produce 32bit and 64bit Windows binaries
             #956  CI: Get off of about-to-be-removed Ubuntu 20.04
        #960 #964  CI: Start uploading to Coverity Scan for static analysis
+            #971  CI: Adapt to breaking changes in Cppcheck
 
         Special thanks to:
             Mark Brand

expat/tests/benchmark/benchmark.c

@@ -121,6 +121,12 @@ main(int argc, char *argv[]) {
   }
 
   XMLBuf = malloc(fileAttr.st_size);
+  if (XMLBuf == NULL) {
+    fclose(file);
+    close(fd);
+    fprintf(stderr, "ouf of memory.\n");
+    return 5;
+  }
   fileSize = fread(XMLBuf, sizeof(char), fileAttr.st_size, file);
   fclose(file);
   close(fd);

expat/tests/minicheck.h

@@ -129,8 +129,10 @@ void _check_set_test_info(char const *function, char const *filename,
  * Prototypes for the actual implementation.
  */
 
-#  if defined(__GNUC__)
+#  if defined(__has_attribute)
+#    if __has_attribute(noreturn)
 __attribute__((noreturn))
+#    endif
 #  endif
 void
 _fail(const char *file, int line, const char *msg);

expat/tests/misc_tests.c

@@ -294,6 +294,7 @@ START_TEST(test_misc_stop_during_end_handler_issue_240_1) {
   parser = XML_ParserCreate(NULL);
   XML_SetElementHandler(parser, start_element_issue_240, end_element_issue_240);
   mydata = (DataIssue240 *)malloc(sizeof(DataIssue240));
+  assert_true(mydata != NULL);
   mydata->parser = parser;
   mydata->deep = 0;
   XML_SetUserData(parser, mydata);
@@ -315,6 +316,7 @@ START_TEST(test_misc_stop_during_end_handler_issue_240_2) {
   parser = XML_ParserCreate(NULL);
   XML_SetElementHandler(parser, start_element_issue_240, end_element_issue_240);
   mydata = (DataIssue240 *)malloc(sizeof(DataIssue240));
+  assert_true(mydata != NULL);
   mydata->parser = parser;
   mydata->deep = 0;
   XML_SetUserData(parser, mydata);