Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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: 3 additions & 0 deletions ext/dba/dba_ndbm.c
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@ DBA_OPEN_FUNC(ndbm)
}

dbf = dbm_open(ZSTR_VAL(info->path), gmode, filemode);
if (dbf == NULL) {
return FAILURE;
}

pinfo->dbf = dbf;
return SUCCESS;
Expand Down
30 changes: 30 additions & 0 deletions ext/dba/tests/gh24641.phpt
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
--TEST--
GH-24641 (ndbm backend never checks dbm_open() return value, NULL deref on first use after a failed open)
--EXTENSIONS--
dba
--FILE--
<?php

file_put_contents(__DIR__ . '/gh24641', 'not a valid ndbm/gdbm database, just plain text');

foreach (dba_handlers() as $handler) {
/* Suppress warnings */
$db = @dba_open(__DIR__ . '/gh24641', 'r', $handler);
/* Expected as this file is not a proper db file */
if ($db === false) {
continue;
}
/* Some drivers just don't care */
dba_firstkey($db); // SEGV
dba_close($db);
}

?>
DONE
--CLEAN--
<?php
@unlink(__DIR__ . '/gh24641');
@unlink(__DIR__ . '/gh24641-lock');
?>
--EXPECT--
DONE
Loading