DBA should not convert elements in-place if the key param is an array

Also check that the value can actually be converted to string

Author: Girgias

ext/dba/dba.c

@@ -89,10 +89,11 @@ ZEND_TSRMLS_CACHE_DEFINE()
 ZEND_GET_MODULE(dba)
 #endif
 
-/* {{{ php_dba_myke_key */
+/* {{{ php_dba_make_key */
 static zend_string* php_dba_make_key(HashTable *key)
 {
 	zval *group, *name;
+	zend_string *group_str, *name_str;
 	HashPosition pos;
 
 	if (zend_hash_num_elements(key) != 2) {
@@ -103,16 +104,29 @@ static zend_string* php_dba_make_key(HashTable *key)
 	// TODO: Use ZEND_HASH_FOREACH_VAL() API?
 	zend_hash_internal_pointer_reset_ex(key, &pos);
 	group = zend_hash_get_current_data_ex(key, &pos);
+	group_str = zval_try_get_string(group);
+	if (!group_str) {
+		return NULL;
+	}
+
 	zend_hash_move_forward_ex(key, &pos);
 	name = zend_hash_get_current_data_ex(key, &pos);
-	// TODO: Use zval_try_get_string() or try_convert_to_string() instead?
-	convert_to_string(group);
-	convert_to_string(name);
+	name_str = zval_try_get_string(name);
+	if (!name_str) {
+		zend_string_release_ex(group_str, false);
+		return NULL;
+	}
+
 	// TODO: Check ZSTR_LEN(name) != 0
-	if (Z_STRLEN_P(group) == 0) {
-		return zend_string_copy(Z_STR_P(name));
+	if (ZSTR_LEN(group_str) == 0) {
+		zend_string_release_ex(group_str, false);
+		return name_str;
 	}
-	return zend_strpprintf(0, "[%s]%s", Z_STRVAL_P(group), Z_STRVAL_P(name));
+
+	zend_string *key_str = zend_strpprintf(0, "[%s]%s", ZSTR_VAL(group_str), ZSTR_VAL(name_str));
+	zend_string_release_ex(group_str, false);
+	zend_string_release_ex(name_str, false);
+	return key_str;
 }
 /* }}} */
 

ext/dba/tests/dba_array_keys_not_string_convertable.phpt

@@ -0,0 +1,41 @@
+--TEST--
+DBA check behaviour of key as an array with elements not convertable to string
+--EXTENSIONS--
+dba
+--SKIPIF--
+<?php
+    require_once(__DIR__ .'/skipif.inc');
+    die("info $HND handler used");
+?>
+--FILE--
+<?php
+require_once(__DIR__ .'/test.inc');
+$db_file = dba_open($db_file, "n", $handler);
+
+if ($db_file === false) {
+    die('Error creating database');
+}
+
+/* Use an object */
+$o = new stdClass();
+try {
+    var_dump(dba_insert([$o, 'obj'], 'Test', $db_file));
+} catch (\Error $e) {
+    echo $e::class, ': ', $e->getMessage(), \PHP_EOL;
+}
+try {
+    var_dump(dba_insert(['group', $o], 'Test', $db_file));
+} catch (\Error $e) {
+    echo $e::class, ': ', $e->getMessage(), \PHP_EOL;
+}
+
+dba_close($db_file);
+
+?>
+--CLEAN--
+<?php
+    require(__DIR__ .'/clean.inc');
+?>
+--EXPECT--
+Error: Object of class stdClass could not be converted to string
+Error: Object of class stdClass could not be converted to string

ext/dba/tests/dba_array_keys_var_non_string.phpt

@@ -0,0 +1,54 @@
+--TEST--
+DBA check behaviour of key as an array with non string elements
+--EXTENSIONS--
+dba
+--SKIPIF--
+<?php
+    require_once(__DIR__ .'/skipif.inc');
+    die("info $HND handler used");
+?>
+--FILE--
+<?php
+require_once(__DIR__ .'/test.inc');
+$db_file = dba_open($db_file, "n", $handler);
+
+if ($db_file === false) {
+    die('Error creating database');
+}
+
+$key = [5, 5.21];
+
+var_dump($key);
+var_dump(dba_insert($key, 'Test', $db_file));
+var_dump($key);
+var_dump(dba_fetch($key, $db_file));
+var_dump($key);
+
+dba_close($db_file);
+
+?>
+--CLEAN--
+<?php
+    require(__DIR__ .'/clean.inc');
+?>
+--EXPECT--
+array(2) {
+  [0]=>
+  int(5)
+  [1]=>
+  float(5.21)
+}
+bool(true)
+array(2) {
+  [0]=>
+  int(5)
+  [1]=>
+  float(5.21)
+}
+string(4) "Test"
+array(2) {
+  [0]=>
+  int(5)
+  [1]=>
+  float(5.21)
+}