PHPC-595: Throw exception if wtimeout > INT32_MAX

This also defines a compatility constant for printing phongo_long, which may vary by PHP version and architecture.

Author: jmikola

phongo_compat.h

@@ -124,6 +124,13 @@
 # define phongo_char_pdup(str) pestrdup(filename->val, 1)
 # define phongo_char_free(str) zend_string_release(str)
 # define phongo_long zend_long
+#if SIZEOF_ZEND_LONG == 8
+#  define PHONGO_LONG_FORMAT PRId64
+#elif SIZEOF_ZEND_LONG == 4
+#  define PHONGO_LONG_FORMAT PRId32
+#else
+#  error Unsupported architecture (integers are neither 32-bit nor 64-bit)
+#endif
 # define SIZEOF_PHONGO_LONG SIZEOF_ZEND_LONG
 # define phongo_str(str) str->val
 # define phongo_create_object_retval zend_object*
@@ -153,6 +160,7 @@
 # define phongo_char_pdup(str) pestrdup(filename, 1)
 # define phongo_char_free(str) _efree(str ZEND_FILE_LINE_CC ZEND_FILE_LINE_CC)
 # define phongo_long long
+# define PHONGO_LONG_FORMAT "ld"
 # define SIZEOF_PHONGO_LONG SIZEOF_LONG
 # define phongo_str(str) str
 # define phongo_create_object_retval zend_object_value

src/MongoDB/WriteConcern.c

@@ -54,7 +54,7 @@ PHP_METHOD(WriteConcern, __construct)
 	php_phongo_writeconcern_t *intern;
 	zend_error_handling       error_handling;
 	zval                     *w, *journal;
-	long                      wtimeout = 0;
+	phongo_long               wtimeout = 0;
 	SUPPRESS_UNUSED_WARNING(return_value) SUPPRESS_UNUSED_WARNING(return_value_ptr) SUPPRESS_UNUSED_WARNING(return_value_used)
 
 
@@ -99,7 +99,12 @@ PHP_METHOD(WriteConcern, __construct)
 			/* fallthrough */
 		case 2:
 			if (wtimeout < 0) {
-				phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Expected wtimeout to be >= 0, %ld given", wtimeout);
+				phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Expected wtimeout to be >= 0, %" PHONGO_LONG_FORMAT " given", wtimeout);
+				return;
+			}
+
+			if (wtimeout > INT32_MAX) {
+				phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Expected wtimeout to be <= %" PRId32 ", %" PHONGO_LONG_FORMAT " given", INT32_MAX, wtimeout);
 				return;
 			}
 

tests/writeConcern/writeconcern-ctor_error-005.phpt

@@ -0,0 +1,20 @@
+--TEST--
+MongoDB\Driver\WriteConcern construction (invalid wtimeout range)
+--SKIPIF--
+<?php if (8 !== PHP_INT_SIZE) { die('skip Only for 64-bit platform'); } ?>
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
+--FILE--
+<?php
+require_once __DIR__ . "/../utils/basic.inc";
+
+echo throws(function() {
+    new MongoDB\Driver\WriteConcern(1, 2147483648);
+}, 'MongoDB\Driver\Exception\InvalidArgumentException'), "\n";
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECT--
+OK: Got MongoDB\Driver\Exception\InvalidArgumentException
+Expected wtimeout to be <= 2147483647, 2147483648 given
+===DONE===