Merge branch 'v1.8'

* v1.8:
  PHPC-1629: Check if read preference is valid during unserialization
  PHPC-1629: Check if write concern is valid during construction and unserialization

Author: alcaeus

src/MongoDB/ReadPreference.c

@@ -138,6 +138,11 @@ static bool php_phongo_readpreference_init_from_hash(php_phongo_readpreference_t
 		}
 	}
 
+	if (!mongoc_read_prefs_is_valid(intern->read_preference)) {
+		phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT, "Read preference is not valid");
+		goto failure;
+	}
+
 	return true;
 
 failure:

src/MongoDB/WriteConcern.c

@@ -80,13 +80,23 @@ static bool php_phongo_writeconcern_init_from_hash(php_phongo_writeconcern_t* in
 
 	if ((j = zend_hash_str_find(props, "j", sizeof("j") - 1))) {
 		if (Z_TYPE_P(j) == IS_TRUE || Z_TYPE_P(j) == IS_FALSE) {
+			if (zend_is_true(j) && (mongoc_write_concern_get_w(intern->write_concern) == MONGOC_WRITE_CONCERN_W_UNACKNOWLEDGED || mongoc_write_concern_get_w(intern->write_concern) == MONGOC_WRITE_CONCERN_W_ERRORS_IGNORED)) {
+				phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT, "Cannot enable journaling when using w = 0");
+				goto failure;
+			}
+
 			mongoc_write_concern_set_journal(intern->write_concern, zend_is_true(j));
 		} else {
 			phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT, "%s initialization requires \"j\" field to be boolean", ZSTR_VAL(php_phongo_writeconcern_ce->name));
 			goto failure;
 		}
 	}
 
+	if (!mongoc_write_concern_is_valid(intern->write_concern)) {
+		phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT, "Write concern is not valid");
+		goto failure;
+	}
+
 	return true;
 
 failure:
@@ -135,11 +145,12 @@ static PHP_METHOD(WriteConcern, __construct)
 	switch (ZEND_NUM_ARGS()) {
 		case 3:
 			if (Z_TYPE_P(journal) != IS_NULL) {
-#ifdef ZEND_ENGINE_3
+				if (zend_is_true(journal) && (mongoc_write_concern_get_w(intern->write_concern) == MONGOC_WRITE_CONCERN_W_UNACKNOWLEDGED || mongoc_write_concern_get_w(intern->write_concern) == MONGOC_WRITE_CONCERN_W_ERRORS_IGNORED)) {
+					phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT, "Cannot enable journaling when using w = 0");
+					return;
+				}
+
 				mongoc_write_concern_set_journal(intern->write_concern, zend_is_true(journal));
-#else
-				mongoc_write_concern_set_journal(intern->write_concern, Z_BVAL_P(journal));
-#endif
 			}
 			/* fallthrough */
 		case 2:
@@ -150,6 +161,11 @@ static PHP_METHOD(WriteConcern, __construct)
 
 			mongoc_write_concern_set_wtimeout_int64(intern->write_concern, (int64_t) wtimeout);
 	}
+
+	if (!mongoc_write_concern_is_valid(intern->write_concern)) {
+		phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT, "Write concern is not valid");
+		return;
+	}
 } /* }}} */
 
 /* {{{ proto void MongoDB\BSON\WriteConcern::__set_state(array $properties)

tests/writeConcern/writeconcern-ctor_error-005.phpt

@@ -0,0 +1,18 @@
+--TEST--
+MongoDB\Driver\WriteConcern construction (journaling with unacknowledged w)
+--FILE--
+<?php
+
+require_once __DIR__ . '/../utils/tools.php';
+
+echo throws(function() {
+    new MongoDB\Driver\WriteConcern(0, 0, true);
+}, 'MongoDB\Driver\Exception\InvalidArgumentException'), "\n";
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECT--
+OK: Got MongoDB\Driver\Exception\InvalidArgumentException
+Cannot enable journaling when using w = 0
+===DONE===

tests/writeConcern/writeconcern-serialization_error-001.phpt

@@ -0,0 +1,18 @@
+--TEST--
+MongoDB\Driver\WriteConcern serialization errors
+--FILE--
+<?php
+
+require_once __DIR__ . '/../utils/tools.php';
+
+echo throws(function() {
+    unserialize('C:27:"MongoDB\Driver\WriteConcern":30:{a:2:{s:1:"w";i:0;s:1:"j";b:1;}}');
+}, 'MongoDB\Driver\Exception\InvalidArgumentException'), "\n";
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECT--
+OK: Got MongoDB\Driver\Exception\InvalidArgumentException
+Cannot enable journaling when using w = 0
+===DONE===