From b445641dd71011632fabe2a972d4a592b32d614d Mon Sep 17 00:00:00 2001 From: Gina Peter Banyard Date: Fri, 4 Oct 2024 14:35:41 +0100 Subject: [PATCH] ext/dba: php_dba_make_key() only returns NULL when an exception occurs --- ext/dba/dba.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/ext/dba/dba.c b/ext/dba/dba.c index 53e79d4d53e..e2d658c5615 100644 --- a/ext/dba/dba.c +++ b/ext/dba/dba.c @@ -478,8 +478,7 @@ static void php_dba_update(INTERNAL_FUNCTION_PARAMETERS, int mode) if (key_ht) { key_str = php_dba_make_key(key_ht); if (!key_str) { - // TODO ValueError? - RETURN_FALSE; + RETURN_THROWS(); } } @@ -1003,8 +1002,7 @@ PHP_FUNCTION(dba_exists) if (key_ht) { key_str = php_dba_make_key(key_ht); if (!key_str) { - // TODO ValueError? - RETURN_FALSE; + RETURN_THROWS(); } } @@ -1050,8 +1048,7 @@ PHP_FUNCTION(dba_fetch) if (key_ht) { key_str = php_dba_make_key(key_ht); if (!key_str) { - // TODO ValueError? - RETURN_FALSE; + RETURN_THROWS(); } } @@ -1184,8 +1181,7 @@ PHP_FUNCTION(dba_delete) if (key_ht) { key_str = php_dba_make_key(key_ht); if (!key_str) { - // TODO ValueError? - RETURN_FALSE; + RETURN_THROWS(); } }