Merge pull request #131 from maxmind/greg/clang-static-analysis

Add Clang static analysis build

Author: horgh

.github/workflows/clang-analyzer.yml

@@ -0,0 +1,37 @@
+name: Clang Static Analysis
+
+on:
+  push:
+  pull_request:
+  schedule:
+    - cron: '45 3 * * SUN'
+
+jobs:
+  run:
+    name: "Clang Static Analysis"
+    runs-on: ubuntu-latest
+    steps:
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 8.0
+          tools: composer, phpize
+
+      - name: Checkout
+        # We use v1 due to https://github.com/actions/checkout/issues/334
+        uses: actions/checkout@v1
+        with:
+          submodules: true
+
+      - name: Install clang-tools and libmaxminddb
+        run: sudo apt-get install clang-tools libmaxminddb-dev
+
+      - name: Build extension
+        run: |
+              export CFLAGS="-L$HOME/libmaxminddb/lib"
+              export CPPFLAGS="-I$HOME/libmaxminddb/include"
+              cd ext
+              phpize
+              scan-build --status-bugs ./configure --with-maxminddb --enable-maxminddb-debug
+              make clean
+              scan-build --status-bugs make

.github/workflows/lint.yml

@@ -1,6 +1,10 @@
 name: PHP Lints
 
-on: [push, pull_request]
+on:
+  push:
+  pull_request:
+  schedule:
+    - cron: '45 3 * * SUN'
 
 jobs:
   run:

.github/workflows/test.yml

@@ -1,6 +1,10 @@
 name: PHPUnit
 
-on: [push, pull_request]
+on:
+  push:
+  pull_request:
+  schedule:
+    - cron: '45 3 * * SUN'
 
 jobs:
   run:
@@ -15,13 +19,12 @@ jobs:
     name: "PHP ${{ matrix.php-versions }} (with ${{ matrix.php-extensions }}) test on ${{ matrix.operating-system }}/${{ matrix.arch }}"
     steps:
       - name: Install PHP
-        run: |
-          spc -U
-          spc --php-version "${{ matrix.php-versions }}" \
-              --extensions "mbstring, intl, ${{ matrix.php-extensions }}" \
-              --ini-values "post_max_size=256M, max_execution_time=180" \
-              --coverage "xdebug" \
-              --tools "composer,phpize"
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-versions }}
+          extensions: "mbstring, intl, ${{ matrix.php-extensions }}"
+          tools: "composer, phpize"
+          coverage: xdebug
 
       - name: Checkout
         # We use v1 due to https://github.com/actions/checkout/issues/334

CHANGELOG.md

@@ -1,6 +1,12 @@
 CHANGELOG
 =========
 
+1.10.2
+-------------------
+
+* Resolve minor issue found by the Clang static analyzer in the C
+  extension.
+
 1.10.1 (2021-04-14)
 -------------------
 

ext/maxminddb.c

@@ -69,6 +69,11 @@ typedef zend_object free_obj_t;
 #define IS_MIXED IS_UNDEF
 #endif
 
+/* ZEND_THIS was added in 7.4 */
+#ifndef ZEND_THIS
+#define ZEND_THIS (&EX(This))
+#endif
+
 typedef struct _maxminddb_obj {
     MMDB_s *mmdb;
     zend_object std;
@@ -151,7 +156,7 @@ PHP_METHOD(MaxMind_Db_Reader, __construct) {
         return;
     }
 
-    maxminddb_obj *mmdb_obj = Z_MAXMINDDB_P(getThis());
+    maxminddb_obj *mmdb_obj = Z_MAXMINDDB_P(ZEND_THIS);
     mmdb_obj->mmdb = mmdb;
 }
 
@@ -202,7 +207,7 @@ get_record(INTERNAL_FUNCTION_PARAMETERS, zval *record, int *prefix_len) {
         return FAILURE;
     }
 
-    const maxminddb_obj *mmdb_obj = (maxminddb_obj *)Z_MAXMINDDB_P(getThis());
+    const maxminddb_obj *mmdb_obj = (maxminddb_obj *)Z_MAXMINDDB_P(ZEND_THIS);
 
     MMDB_s *mmdb = mmdb_obj->mmdb;