Merge pull request #126 from maxmind/greg/32-bit-build

Test 32-bit build and fix bcmath issue. Closes #124

Author: horgh

.github/workflows/test.yml

@@ -5,23 +5,27 @@ on: [push, pull_request]
 jobs:
   run:
     runs-on: ${{ matrix.operating-system }}
+    container: shivammathur/node:latest-${{ matrix.arch }}
     strategy:
       matrix:
+        arch: ["amd64", "i386"]
         operating-system: [ubuntu-latest]
         php-versions: ['7.2', '7.3', '7.4', '8.0']
-    name: "PHP ${{ matrix.php-versions }} test on ${{ matrix.operating-system }}"
+        php-extensions: ['bcmath', 'gmp']
+    name: "PHP ${{ matrix.php-versions }} (with ${{ matrix.php-extensions }}) test on ${{ matrix.operating-system }}/${{ matrix.arch }}"
     steps:
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php-versions }}
-          tools: composer, phpize
-
-      - name: Setup problem matchers for PHPUnit
-        run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
+      - 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"
 
       - name: Checkout
-        uses: actions/checkout@v2
+        # We use v1 due to https://github.com/actions/checkout/issues/334
+        uses: actions/checkout@v1
         with:
           submodules: true
 

CHANGELOG.md

@@ -1,6 +1,13 @@
 CHANGELOG
 =========
 
+1.10.1
+-------------------
+
+* Fix a `TypeError` exception in the pure PHP reader when using large
+  databases on 32-bit PHP builds with the `bcmath` extension. Reported
+  by dodo1708. GitHub #124.
+
 1.10.0 (2021-02-09)
 -------------------
 

src/MaxMind/Db/Reader/Decoder.php

@@ -286,17 +286,13 @@ private function decodePointer(int $ctrlByte, int $offset): array
                 // machines
                 $pointerOffset = $this->decodeUint($buffer, $pointerSize);
 
-                $byteLength = $pointerSize + $this->pointerBaseByteSize;
-
-                if ($byteLength <= _MM_MAX_INT_BYTES) {
-                    $pointer = $pointerOffset + $this->pointerBase;
-                } elseif (\extension_loaded('gmp')) {
-                    $pointer = gmp_strval(gmp_add($pointerOffset, $this->pointerBase));
-                } elseif (\extension_loaded('bcmath')) {
-                    $pointer = bcadd($pointerOffset, (string) $this->pointerBase);
+                $pointerBase = $this->pointerBase;
+
+                if (\PHP_INT_MAX - $pointerBase >= $pointerOffset) {
+                    $pointer = $pointerOffset + $pointerBase;
                 } else {
                     throw new RuntimeException(
-                        'The gmp or bcmath extension must be installed to read this database.'
+                        'The database offset is too large to be represented on your platform.'
                     );
                 }
 

tests/MaxMind/Db/Test/Reader/DecoderTest.php

@@ -159,7 +159,7 @@ class DecoderTest extends TestCase
      */
     private function pointers(): array
     {
-        return [
+        $v = [
             ['expected' => 0, 'input' => [0x20, 0x0]],
             ['expected' => 5, 'input' => [0x20, 0x5]],
             ['expected' => 10, 'input' => [0x20, 0xa]],
@@ -168,9 +168,14 @@ private function pointers(): array
             ['expected' => 524283, 'input' => [0x2f, 0xf7, 0xfb]],
             ['expected' => 526335, 'input' => [0x2f, 0xff, 0xff]],
             ['expected' => 134217726, 'input' => [0x37, 0xf7, 0xf7, 0xfe]],
-            ['expected' => \PHP_INT_MAX < 4294967295 ? '2147483647' : 2147483647, 'input' => [0x38, 0x7f, 0xff, 0xff, 0xff]],
-            ['expected' => \PHP_INT_MAX < 4294967295 ? '4294967295' : 4294967295, 'input' => [0x38, 0xff, 0xff, 0xff, 0xff]],
+            ['expected' => 2147483647, 'input' => [0x38, 0x7f, 0xff, 0xff, 0xff]],
         ];
+
+        if (\PHP_INT_MAX > 4294967295) {
+            array_push($v, ['expected' => 4294967295, 'input' => [0x38, 0xff, 0xff, 0xff, 0xff]]);
+        }
+
+        return $v;
     }
 
     /**