PHPC-592: ADD_ASSOC_STRINGL() can only be used with string literals

The previous macro uses ZEND_STRL(), which calculates the string length via sizeof() and makes it suitable only for string literals. Since this code is utilized by php_phongo_bson_visit_int64(), we must rely on strlen() to compute the field name length.

Author: jmikola

phongo_compat.h

@@ -110,7 +110,7 @@
 		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_STRINGL(zval, key, tmp, tmp_len); \
+		ADD_ASSOC_STRING_EX(zval, key, strlen(key), tmp, tmp_len); \
 		efree(tmp); \
 	} else { \
 		add_assoc_long(zval, key, value); \

tests/bson/bug0592.phpt

@@ -0,0 +1,94 @@
+--TEST--
+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'); } ?>
+<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
+--INI--
+mongodb.debug=stderr
+--FILE--
+<?php
+
+require_once __DIR__ . "/../utils/basic.inc";
+
+$tests = [
+    '{ "x": { "$numberLong": "-2147483648" }}',
+    '{ "x": { "$numberLong": "2147483647" }}',
+    '{ "x": { "$numberLong": "4294967294" }}',
+    '{ "x": { "$numberLong": "4294967295" }}',
+    '{ "x": { "$numberLong": "9223372036854775807" }}',
+    '{ "longFieldName": { "$numberLong": "-2147483648" }}',
+    '{ "longFieldName": { "$numberLong": "2147483647" }}',
+    '{ "longFieldName": { "$numberLong": "4294967294" }}',
+    '{ "longFieldName": { "$numberLong": "4294967295" }}',
+    '{ "longFieldName": { "$numberLong": "9223372036854775807" }}',
+];
+
+foreach ($tests as $json) {
+    printf("Test %s\n", $json);
+    var_dump(toPHP(fromJSON($json)));
+    echo "\n";
+}
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECTF--
+Test { "x": { "$numberLong": "-2147483648" }}
+object(stdClass)#%d (%d) {
+  ["x"]=>
+  int(-2147483648)
+}
+
+Test { "x": { "$numberLong": "2147483647" }}
+object(stdClass)#%d (%d) {
+  ["x"]=>
+  int(2147483647)
+}
+
+Test { "x": { "$numberLong": "4294967295" }}
+[%s]     PHONGO-BSON: WARNING   > ENTRY: Integer overflow detected on your platform: 4294967295
+object(stdClass)#%d (%d) {
+  ["x"]=>
+  string(10) "4294967295"
+}
+
+Test { "x": { "$numberLong": "9223372036854775807" }}
+[%s]     PHONGO-BSON: WARNING   > ENTRY: Integer overflow detected on your platform: 9223372036854775807
+object(stdClass)#%d (%d) {
+  ["x"]=>
+  string(19) "9223372036854775807"
+}
+
+Test { "longFieldName": { "$numberLong": "-2147483648" }}
+object(stdClass)#%d (%d) {
+  ["longFieldName"]=>
+  int(-2147483648)
+}
+
+Test { "longFieldName": { "$numberLong": "2147483647" }}
+object(stdClass)#%d (%d) {
+  ["longFieldName"]=>
+  int(2147483647)
+}
+
+Test { "longFieldName": { "$numberLong": "4294967294" }}
+object(stdClass)#%d (%d) {
+  ["longFieldName"]=>
+  string(10) "4294967294"
+}
+
+Test { "longFieldName": { "$numberLong": "4294967295" }}
+[%s]     PHONGO-BSON: WARNING   > ENTRY: Integer overflow detected on your platform: 4294967295
+object(stdClass)#%d (%d) {
+  ["longFieldName"]=>
+  string(10) "4294967295"
+}
+
+Test { "longFieldName": { "$numberLong": "9223372036854775807" }}
+[%s]     PHONGO-BSON: WARNING   > ENTRY: Integer overflow detected on your platform: 9223372036854775807
+object(stdClass)#%d (%d) {
+  ["longFieldName"]=>
+  string(19) "9223372036854775807"
+}
+
+===DONE===