Merged pull request #69

Author: derickr

ext_mongodb.php

@@ -657,6 +657,10 @@ final class Binary implements Type, \Serializable
 
 	public function __construct(private string $data, private int $type)
 	{
+		if ( $type < 0 || $type > 255 )
+		{
+			throw new \MongoDB\Driver\Exception\InvalidArgumentException( "Expected type to be an unsigned 8-bit integer, {$type} given" );
+		}
 	}
 
 	public function getType()
@@ -758,6 +762,14 @@ final class Timestamp implements Type, \Serializable
 
 	public function __construct(private int $increment, private int $timestamp)
 	{
+		if ( $increment < 0 || $increment > 4294967295 )
+		{
+			throw new \MongoDB\Driver\Exception\InvalidArgumentException( "Expected increment to be an unsigned 32-bit integer, {$increment} given" );
+		}
+		if ( $timestamp < 0 || $timestamp > 4294967295 )
+		{
+			throw new \MongoDB\Driver\Exception\InvalidArgumentException( "Expected timestamp to be an unsigned 32-bit integer, {$timestamp} given" );
+		}
 	}
 
 	public function __toString() : string

src/MongoDB/Driver/WriteConcern.cpp

@@ -94,6 +94,18 @@ void HHVM_METHOD(MongoDBDriverWriteConcern, __construct, const Variant &w, const
 			throw MongoDriver::Utils::throwInvalidArgumentException((char*) wtimeout_error.toString().c_str());
 		}
 
+		if (wtimeout_int > INT32_MAX) {
+			StringBuffer buf;
+
+			buf.printf(
+				"Expected wtimeout to be <= %d, %ld given",
+				INT32_MAX,
+				wtimeout_int
+			);
+			Variant wtimeout_error = buf.detach();
+			throw MongoDriver::Utils::throwInvalidArgumentException((char*) wtimeout_error.toString().c_str());
+		}
+
 		mongoc_write_concern_set_wtimeout(data->m_write_concern, wtimeout_int);
 	}