[PHP-47] validate null values in collection types

Author: Bulat Shakirzyanov

ext/src/Cassandra/Collection.c

@@ -137,6 +137,13 @@ PHP_METHOD(Collection, add)
   collection = (cassandra_collection*) zend_object_store_get_object(getThis() TSRMLS_CC);
 
   for (i = 0; i < argc; i++) {
+    if (Z_TYPE_P(*args[i]) == IS_NULL) {
+      efree(args);
+      zend_throw_exception_ex(cassandra_invalid_argument_exception_ce, 0 TSRMLS_CC,
+                              "Invalid value: null is not supported inside collections");
+      RETURN_FALSE;
+    }
+
     if (!php_cassandra_validate_object(*args[i], collection->type TSRMLS_CC)) {
       efree(args);
       RETURN_FALSE;

ext/src/Cassandra/Map.c

@@ -16,6 +16,18 @@ php_cassandra_map_set(cassandra_map* map, zval* zkey, zval* zvalue TSRMLS_DC)
   int   key_len;
   int   result = 0;
 
+  if (Z_TYPE_P(zkey) == IS_NULL) {
+    zend_throw_exception_ex(cassandra_invalid_argument_exception_ce, 0 TSRMLS_CC,
+                            "Invalid key: null is not supported inside maps");
+    return 0;
+  }
+
+  if (Z_TYPE_P(zvalue) == IS_NULL) {
+    zend_throw_exception_ex(cassandra_invalid_argument_exception_ce, 0 TSRMLS_CC,
+                            "Invalid value: null is not supported inside maps");
+    return 0;
+  }
+
   if (!php_cassandra_hash_object(zkey, map->key_type, &key, &key_len TSRMLS_CC)) {
     zend_throw_exception_ex(cassandra_invalid_argument_exception_ce, 0 TSRMLS_CC, "Invalid key");
     return 0;

ext/src/Cassandra/Set.c

@@ -11,6 +11,12 @@ php_cassandra_set_add(cassandra_set* set, zval* object TSRMLS_DC)
   int   key_len;
   int   result = 0;
 
+  if (Z_TYPE_P(object) == IS_NULL) {
+    zend_throw_exception_ex(cassandra_invalid_argument_exception_ce, 0 TSRMLS_CC,
+                            "Invalid value: null is not supported inside sets");
+    return 0;
+  }
+
   if (!php_cassandra_hash_object(object, set->type, &key, &key_len TSRMLS_CC))
     return 0;
 

tests/Cassandra/MapTest.php

@@ -37,4 +37,14 @@ public function testSupportsOnlyCassandraTypesForValues()
     {
         new Map(\Cassandra::TYPE_VARINT, 'another custom type');
     }
+
+    /**
+     * @expectedException         InvalidArgumentException
+     * @expectedExceptionMessage  Invalid value: null is not supported inside maps
+     */
+    public function testSupportsNullValues()
+    {
+        $map = new Map(\Cassandra::TYPE_VARCHAR, \Cassandra::TYPE_VARCHAR);
+        $map->set("test", null);
+    }
 }