Merge pull request #241

Author: jmikola

src/BSON/UTCDateTime.c

@@ -55,7 +55,7 @@ PHP_METHOD(UTCDateTime, __construct)
 	long                      milliseconds;
 #if SIZEOF_LONG == 4
 	char                        *s_milliseconds;
-	int 	                     s_milliseconds_len;
+	int                          s_milliseconds_len;
 #endif
 
 

src/bson.c

@@ -41,22 +41,6 @@
 #include "php_phongo.h"
 #include "php_bson.h"
 
-
-#define BSON_APPEND_INT32(b,key,val) \
-	bson_append_int32 (b, key, (int) strlen (key), val)
-
-#if SIZEOF_LONG == 8
-#	define BSON_APPEND_INT(b, key, keylen, val) \
-	if (val > INT_MAX || val < INT_MIN) { \
-		bson_append_int64(b, key, keylen, val); \
-	} else { \
-		bson_append_int32(b, key, keylen, val); \
-	}
-#elif SIZEOF_LONG == 4
-#	define BSON_APPEND_INT(b, key, keylen, val) \
-	bson_append_int32(b, key, keylen, val);
-#endif
-
 #undef MONGOC_LOG_DOMAIN
 #define MONGOC_LOG_DOMAIN "PHONGO-BSON"
 
@@ -1005,7 +989,17 @@ static void phongo_bson_append(bson_t *bson, php_phongo_bson_flags_t flags, cons
 #endif
 
 		case IS_LONG:
-			BSON_APPEND_INT(bson, key, key_len, Z_LVAL_P(entry));
+#if SIZEOF_LONG == 8 || (PHP_VERSION_ID >= 70000 && SIZEOF_ZEND_LONG == 8)
+			if (val > INT_MAX || val < INT_MIN) {
+				bson_append_int64(bson, key, keylen, Z_LVAL_P(entry));
+			} else {
+				bson_append_int32(bson, key, keylen, Z_LVAL_P(entry));
+			}
+#elif SIZEOF_LONG == 4 || (PHP_VERSION_ID >= 70000 && SIZEOF_ZEND_LONG == 4)
+			bson_append_int32(bson, key, keylen, Z_LVAL_P(entry));
+#else
+#error Need fix for this architecture
+#endif
 			break;
 
 		case IS_DOUBLE:

tests/standalone/bug0544.phpt

@@ -0,0 +1,36 @@
+--TEST--
+PHPC-544: Unexpected 64-bit integer truncation
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; CLEANUP(STANDALONE)?>
+--FILE--
+<?php
+require_once __DIR__ . "/../utils/basic.inc";
+
+$manager = new MongoDB\Driver\Manager(STANDALONE);
+
+$bulk = new MongoDB\Driver\BulkWrite;
+$bulk->insert(['x' => 4294967295]);
+$result = $manager->executeBulkWrite(NS, $bulk);
+printf("Inserted %d document(s)\n", $result->getInsertedCount());
+
+$cursor = $manager->executeQuery(NS, new MongoDB\Driver\Query([]));
+var_dump($cursor->toArray());
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECTF--
+Inserted 1 document(s)
+array(1) {
+  [0]=>
+  object(stdClass)#%d (%d) {
+    ["_id"]=>
+    object(MongoDB\BSON\ObjectID)#%d (%d) {
+      ["oid"]=>
+      string(24) "%x"
+    }
+    ["x"]=>
+    int(4294967295)
+  }
+}
+===DONE===