Skip to content

Fix DBA on MacOS #7611

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 23, 2021
Merged

Fix DBA on MacOS #7611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ext/dba/dba.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,9 @@ static zend_string* php_dba_make_key(HashTable *key)
// TODO: Use zval_try_get_string() or try_convert_to_string() instead?
convert_to_string(group);
convert_to_string(name);
// TODO: Check ZSTR_LEN(name) != 0
if (Z_STRLEN_P(group) == 0) {
return Z_STR_P(name);
return zend_string_copy(Z_STR_P(name));
}
return zend_strpprintf(0, "[%s]%s", Z_STRVAL_P(group), Z_STRVAL_P(name));
}
Expand Down
42 changes: 42 additions & 0 deletions ext/dba/tests/dba_array_keys.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
--TEST--
DBA check behaviour of array keys
--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');
}

var_dump(dba_insert(['group', 'name'], 'Normal group', $db_file));
var_dump(dba_insert(['group', ''], 'Empty name', $db_file));
var_dump(dba_insert(['', 'name'], 'Empty group', $db_file));
var_dump(dba_insert(['', ''], 'Empty keys', $db_file));
var_dump(dba_fetch(['group', 'name'], $db_file));
var_dump(dba_fetch(['group', ''], $db_file));
var_dump(dba_fetch(['', 'name'], $db_file));
var_dump(dba_fetch(['', ''], $db_file));
dba_close($db_file);

?>
--CLEAN--
<?php
require(__DIR__ .'/clean.inc');
?>
--EXPECT--
bool(true)
bool(true)
bool(true)
bool(true)
string(12) "Normal group"
string(10) "Empty name"
string(11) "Empty group"
string(10) "Empty keys"