PHPC-593: Binary type is an unsigned 8-bit integer

This adds range checking to Binary's constructor. Internal structs and functions were changed to use uint8_t for readability.

Author: jmikola

php_phongo.c

@@ -2080,7 +2080,7 @@ void php_phongo_new_binary_from_binary_and_type(zval *object, const char *data,
 	intern = Z_BINARY_OBJ_P(object);
 	intern->data = estrndup(data, data_len);
 	intern->data_len = data_len;
-	intern->type = type;
+	intern->type = (uint8_t) type;
 } /* }}} */
 void php_phongo_new_regex_from_regex_and_options(zval *object, const char *pattern, const char *flags TSRMLS_DC) /* {{{ */
 {

php_phongo_structs-5.h

@@ -120,7 +120,7 @@ typedef struct {
 	zend_object              std;
 	char                    *data;
 	int                      data_len;
-	int                      type;
+	uint8_t                  type;
 } php_phongo_binary_t;
 typedef struct {
 	zend_object              std;

src/BSON/Binary.c

@@ -54,7 +54,7 @@ PHP_METHOD(Binary, __construct)
 	zend_error_handling     error_handling;
 	char                   *data;
 	phongo_zpp_char_len     data_len;
-	long                    type;
+	phongo_long             type;
 
 
 	zend_replace_error_handling(EH_THROW, phongo_exception_from_phongo_domain(PHONGO_ERROR_INVALID_ARGUMENT), &error_handling TSRMLS_CC);
@@ -66,9 +66,14 @@ PHP_METHOD(Binary, __construct)
 	}
 	zend_restore_error_handling(&error_handling TSRMLS_CC);
 
+	if (type < 0 || type > UINT8_MAX) {
+		phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Expected type to be an unsigned 8-bit integer, %" PHONGO_LONG_FORMAT " given", type);
+		return;
+	}
+
 	intern->data = estrndup(data, data_len);
 	intern->data_len = data_len;
-	intern->type = type;
+	intern->type = (uint8_t) type;
 }
 /* }}} */
 /* {{{ proto string Binary::getData()

src/bson.c

@@ -142,7 +142,7 @@ int php_phongo_binary_get_data(zval *object, char **data TSRMLS_DC)
 	*data = intern->data;
 	return intern->data_len;
 }
-int php_phongo_binary_get_type(zval *object TSRMLS_DC)
+uint8_t php_phongo_binary_get_type(zval *object TSRMLS_DC)
 {
 	php_phongo_binary_t *intern;
 

tests/bson/bson-binary_error-004.phpt

@@ -0,0 +1,27 @@
+--TEST--
+BSON BSON\Binary constructor requires unsigned 8-bit integer for type
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
+--FILE--
+<?php
+require_once __DIR__ . "/../utils/basic.inc";
+
+use MongoDB\BSON as BSON;
+
+echo throws(function() {
+    new BSON\Binary('foo', -1);
+}, 'MongoDB\Driver\Exception\InvalidArgumentException'), "\n";
+
+echo throws(function() {
+    new BSON\Binary('foo', 256);
+}, 'MongoDB\Driver\Exception\InvalidArgumentException'), "\n";
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECTF--
+OK: Got MongoDB\Driver\Exception\InvalidArgumentException
+Expected type to be an unsigned 8-bit integer, -1 given
+OK: Got MongoDB\Driver\Exception\InvalidArgumentException
+Expected type to be an unsigned 8-bit integer, 256 given
+===DONE===