PHPC-313: BSON should throw when encountering 64-bit integer on 32-bit platform

Author: derickr

phongo_compat.h

@@ -150,23 +150,13 @@
 #elif SIZEOF_PHONGO_LONG == 4
 # define ADD_INDEX_INT64(zval, index, value) \
     if (value > INT32_MAX || value < INT32_MIN) { \
-        char *tmp; \
-        int tmp_len; \
-        mongoc_log(MONGOC_LOG_LEVEL_WARNING, MONGOC_LOG_DOMAIN, "Integer overflow detected on your platform: %lld", value); \
-        tmp_len = spprintf(&tmp, 0, "%lld", value); \
-        ADD_INDEX_STRINGL(zval, index, tmp, tmp_len); \
-        efree(tmp); \
+        phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Integer overflow detected on your platform: %lld", value); \
     } else { \
         add_index_long(zval, index, val); \
     }
 # define ADD_ASSOC_INT64(zval, key, value) \
     if (value > INT32_MAX || value < INT32_MIN) { \
-        char *tmp; \
-        int tmp_len; \
-        mongoc_log(MONGOC_LOG_LEVEL_WARNING, MONGOC_LOG_DOMAIN, "Integer overflow detected on your platform: %lld", value); \
-        tmp_len = spprintf(&tmp, 0, "%lld", value); \
-        ADD_ASSOC_STRING_EX(zval, key, strlen(key), tmp, tmp_len); \
-        efree(tmp); \
+        phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Integer overflow detected on your platform: %lld", value); \
     } else { \
         add_assoc_long(zval, key, value); \
     }

tests/bson/bug0313.phpt

@@ -0,0 +1,33 @@
+--TEST--
+PHPC-313: BSON should throw when encountering 64-bit integer on 32-bit platform
+--SKIPIF--
+<?php if (4 !== PHP_INT_SIZE) { die('skip Only for 32-bit platform'); } ?>
+--FILE--
+<?php
+
+require_once __DIR__ . '/../utils/tools.php';
+
+$tests = [
+    '{ "x": { "$numberLong": "4294967294" }}',
+    '{ "x": { "$numberLong": "4294967295" }}',
+    '{ "x": { "$numberLong": "9223372036854775807" }}',
+    '{ "longFieldName": { "$numberLong": "4294967294" }}',
+    '{ "longFieldName": { "$numberLong": "4294967295" }}',
+    '{ "longFieldName": { "$numberLong": "9223372036854775807" }}',
+];
+
+foreach ($tests as $json) {
+    throws(function() use ($json) { var_dump(toPHP(fromJSON($json))); }, 'MongoDB\Driver\Exception\InvalidArgumentException');
+}
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECT--
+OK: Got MongoDB\Driver\Exception\InvalidArgumentException
+OK: Got MongoDB\Driver\Exception\InvalidArgumentException
+OK: Got MongoDB\Driver\Exception\InvalidArgumentException
+OK: Got MongoDB\Driver\Exception\InvalidArgumentException
+OK: Got MongoDB\Driver\Exception\InvalidArgumentException
+OK: Got MongoDB\Driver\Exception\InvalidArgumentException
+===DONE===

tests/bson/bug0592.phpt

@@ -2,8 +2,6 @@
 PHPC-592: Property name corrupted when unserializing 64-bit integer on 32-bit platform
 --SKIPIF--
 <?php if (4 !== PHP_INT_SIZE) { die('skip Only for 32-bit platform'); } ?>
---INI--
-mongodb.debug=stderr
 --FILE--
 <?php
 
@@ -24,15 +22,19 @@ $tests = [
 
 foreach ($tests as $json) {
     printf("Test %s\n", $json);
-    var_dump(toPHP(fromJSON($json)));
+    try {
+        $encoded = toPHP(fromJSON($json));
+        var_dump( $encoded );
+    } catch ( MongoDB\Driver\Exception\InvalidArgumentException $e ) {
+        echo "MongoDB\Driver\Exception\InvalidArgumentException: ", $e->getMessage(), "\n";
+    }
     echo "\n";
 }
 
 ?>
 ===DONE===
 <?php exit(0); ?>
 --EXPECTF--
-%a
 Test { "x": { "$numberLong": "-2147483648" }}
 object(stdClass)#%d (%d) {
   ["x"]=>
@@ -46,25 +48,13 @@ object(stdClass)#%d (%d) {
 }
 
 Test { "x": { "$numberLong": "4294967294" }}
-[%s] PHONGO-BSON: WARNING > Integer overflow detected on your platform: 4294967294
-object(stdClass)#%d (%d) {
-  ["x"]=>
-  string(10) "4294967294"
-}
+MongoDB\Driver\Exception\InvalidArgumentException: Integer overflow detected on your platform: 4294967294
 
 Test { "x": { "$numberLong": "4294967295" }}
-[%s] PHONGO-BSON: WARNING > Integer overflow detected on your platform: 4294967295
-object(stdClass)#%d (%d) {
-  ["x"]=>
-  string(10) "4294967295"
-}
+MongoDB\Driver\Exception\InvalidArgumentException: Integer overflow detected on your platform: 4294967295
 
 Test { "x": { "$numberLong": "9223372036854775807" }}
-[%s] PHONGO-BSON: WARNING > Integer overflow detected on your platform: 9223372036854775807
-object(stdClass)#%d (%d) {
-  ["x"]=>
-  string(19) "9223372036854775807"
-}
+MongoDB\Driver\Exception\InvalidArgumentException: Integer overflow detected on your platform: 9223372036854775807
 
 Test { "longFieldName": { "$numberLong": "-2147483648" }}
 object(stdClass)#%d (%d) {
@@ -79,24 +69,12 @@ object(stdClass)#%d (%d) {
 }
 
 Test { "longFieldName": { "$numberLong": "4294967294" }}
-[%s] PHONGO-BSON: WARNING > Integer overflow detected on your platform: 4294967294
-object(stdClass)#%d (%d) {
-  ["longFieldName"]=>
-  string(10) "4294967294"
-}
+MongoDB\Driver\Exception\InvalidArgumentException: Integer overflow detected on your platform: 4294967294
 
 Test { "longFieldName": { "$numberLong": "4294967295" }}
-[%s] PHONGO-BSON: WARNING > Integer overflow detected on your platform: 4294967295
-object(stdClass)#%d (%d) {
-  ["longFieldName"]=>
-  string(10) "4294967295"
-}
+MongoDB\Driver\Exception\InvalidArgumentException: Integer overflow detected on your platform: 4294967295
 
 Test { "longFieldName": { "$numberLong": "9223372036854775807" }}
-[%s] PHONGO-BSON: WARNING > Integer overflow detected on your platform: 9223372036854775807
-object(stdClass)#%d (%d) {
-  ["longFieldName"]=>
-  string(19) "9223372036854775807"
-}
+MongoDB\Driver\Exception\InvalidArgumentException: Integer overflow detected on your platform: 9223372036854775807
 
 ===DONE===