Merge pull request #5706 from craigcomstock/2025-03-06-static-check-fixes

2025 03 06 static check fixes

Author: craigcomstock

.github/workflows/job-static-check.yml

@@ -38,13 +38,7 @@ jobs:
     - name: Prepare Environment
       run: |
         sudo apt-get update && \
-        sudo apt-get install -y dpkg-dev debhelper g++ libncurses6 pkg-config \
-          build-essential libpam0g-dev fakeroot gcc make autoconf buildah \
-          liblmdb-dev libacl1-dev libcurl4-openssl-dev libyaml-dev libxml2-dev \
-          libssl-dev libpcre2-dev librsync-dev
-
-    - name: Run Autogen
-      run: NO_CONFIGURE=1 PROJECT=community ./buildscripts/build-scripts/autogen
+        sudo apt-get install -y buildah
 
     - name: Run The Test
       working-directory: ./core

cf-check/dump.c

@@ -224,7 +224,7 @@ static void print_struct_persistent_class(
         /* Make a copy to ensure proper alignment. We cannot just copy data to a
          * local PersistentClassInfo variable because it contains a
          * variable-length string at the end (see the struct definition). */
-        PersistentClassInfo *class_info = malloc(value.mv_size);
+        PersistentClassInfo *class_info = xmalloc(value.mv_size);
         memcpy(class_info, value.mv_data, value.mv_size);
         const unsigned int expires = class_info->expires;
         const PersistentClassPolicy policy = class_info->policy;

libntech

@@ -84,7 +84,7 @@ static CfLockStack *LOCK_STACK = NULL;
 
 static void PushLock(char *lock, char *last)
 {
-    CfLockStack *new_lock = malloc(sizeof(CfLockStack));
+    CfLockStack *new_lock = xmalloc(sizeof(CfLockStack));
     strlcpy(new_lock->lock, lock, CF_BUFSIZE);
     strlcpy(new_lock->last, last, CF_BUFSIZE);
 

libpromises/locks.c

@@ -5,25 +5,34 @@ set -x
 n_procs="$(getconf _NPROCESSORS_ONLN)"
 
 function check_with_gcc() {
+  # previous runs may have cached configuration based on a different CC
   rm -f config.cache
   make clean
-  ./configure -C --enable-debug CC=gcc
+  # here --config-cache enables lots of checks in subdir libntech to re-use checks made in core
+  ./configure --config-cache --enable-debug CC=gcc
   local gcc_exceptions="-Wno-sign-compare -Wno-enum-int-mismatch"
   make -j -l${n_procs} --keep-going CFLAGS="-Werror -Wall -Wextra $gcc_exceptions"
 }
 
 function check_with_clang() {
+  # previous runs may have cached configuration based on a different CC
   rm -f config.cache
   make clean
-  ./configure -C --enable-debug CC=clang
+  # here --config-cache enables lots of checks in subdir libntech to re-use checks made in core
+  ./configure --config-cache --enable-debug CC=clang
   make -j -l${n_procs} --keep-going CFLAGS="-Werror -Wall -Wextra -Wno-sign-compare"
 }
 
 function check_with_cppcheck() {
+  # previous runs may have cached configuration based on a different CC
   rm -f config.cache
   make clean
+  # here --config-cache enables lots of checks in subdir libntech to re-use checks made in core
+  ./configure --config-cache --enable-debug
   make -C libpromises/ bootstrap.inc # needed by libpromises/bootstrap.c
-  ./configure -C --enable-debug
+
+  # print out cppcheck version for comparisons over time in case of regressions due to newer versions
+  cppcheck --version
 
   # cppcheck options:
   #   -I -- include paths
@@ -43,6 +52,13 @@ cd "$(dirname $0)"/../../
 
 failure=0
 failures=""
+
+# in jenkins the workdir is already autogen'd
+# in github it is not, so do that work here
+if [ ! -f configure ]; then
+  ./autogen.sh --enable-debug
+fi
+
 check_with_gcc              || { failures="${failures}FAIL: GCC check failed\n"; failure=1; }
 check_with_clang            || { failures="${failures}FAIL: Clang check failed\n"; failure=1; }
 check_with_cppcheck         || { failures="${failures}FAIL: cppcheck failed\n"; failure=1; }