PHPC-1093: Bound checking on 32-bit platforms for APM's duration_micros

Author: derickr

phongo_compat.h

@@ -143,22 +143,22 @@
 # define ADD_ASSOC_INT64(zval, key, value) add_assoc_long(zval, key, value)
 #elif SIZEOF_PHONGO_LONG == 4
 # define ADD_INDEX_INT64(zval, index, value) \
-    if (value > INT32_MAX || value < INT32_MIN) { \
-        phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Integer overflow detected on your platform: %lld", value); \
+    if ((value) > INT32_MAX || (value) < INT32_MIN) { \
+        phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Integer overflow detected on your platform: %lld", (value)); \
     } else { \
-        add_index_long(zval, index, value); \
+        add_index_long(zval, index, (value)); \
     }
 # define ADD_NEXT_INDEX_INT64(zval, value) \
-    if (value > INT32_MAX || value < INT32_MIN) { \
-        phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Integer overflow detected on your platform: %lld", value); \
+    if ((value) > INT32_MAX || (value) < INT32_MIN) { \
+        phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Integer overflow detected on your platform: %lld", (value)); \
     } else { \
-        add_next_index_long(zval, value); \
+        add_next_index_long(zval, (value)); \
     }
 # define ADD_ASSOC_INT64(zval, key, value) \
-    if (value > INT32_MAX || value < INT32_MIN) { \
-        phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Integer overflow detected on your platform: %lld", value); \
+    if ((value) > INT32_MAX || (value) < INT32_MIN) { \
+        phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Integer overflow detected on your platform: %lld", (value)); \
     } else { \
-        add_assoc_long(zval, key, value); \
+        add_assoc_long(zval, key, (value)); \
     }
 #else
 # error Unsupported architecture (integers are neither 32-bit nor 64-bit)

src/MongoDB/Monitoring/CommandFailedEvent.c

@@ -214,7 +214,7 @@ static HashTable *php_phongo_commandfailedevent_get_debug_info(zval *object, int
 	array_init_size(&retval, 6);
 
 	ADD_ASSOC_STRING(&retval, "commandName", intern->command_name);
-	ADD_ASSOC_INT64(&retval, "durationMicros", intern->duration_micros);
+	ADD_ASSOC_INT64(&retval, "durationMicros", (int64_t) intern->duration_micros);
 
 #if PHP_VERSION_ID >= 70000
 	ADD_ASSOC_ZVAL_EX(&retval, "error", &intern->z_error);

src/MongoDB/Monitoring/CommandSucceededEvent.c

@@ -216,7 +216,7 @@ static HashTable *php_phongo_commandsucceededevent_get_debug_info(zval *object,
 	array_init_size(&retval, 6);
 
 	ADD_ASSOC_STRING(&retval, "commandName", intern->command_name);
-	ADD_ASSOC_INT64(&retval, "durationMicros", intern->duration_micros);
+	ADD_ASSOC_INT64(&retval, "durationMicros", (int64_t) intern->duration_micros);
 
 	sprintf(operation_id, "%" PHONGO_LONG_FORMAT, intern->operation_id);
 	ADD_ASSOC_STRING(&retval, "operationId", operation_id);