ext/dba: php_dba_make_key() only returns NULL when an exception occurs

Girgias · Girgias · commit b445641dd710 · 2024-10-05T17:48:28.000+01:00
diff --git 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();
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -478,8 +478,7 @@ static void php_dba_update(INTERNAL_FUNCTION_PARAMETERS, int mode)`
`478`	`478`	`if (key_ht) {`
`479`	`479`	`key_str = php_dba_make_key(key_ht);`
`480`	`480`	`if (!key_str) {`
`481`		`- // TODO ValueError?`
`482`		`- RETURN_FALSE;`
	`481`	`+ RETURN_THROWS();`
`483`	`482`	`}`
`484`	`483`	`}`
`485`	`484`
`@@ -1003,8 +1002,7 @@ PHP_FUNCTION(dba_exists)`
`1003`	`1002`	`if (key_ht) {`
`1004`	`1003`	`key_str = php_dba_make_key(key_ht);`
`1005`	`1004`	`if (!key_str) {`
`1006`		`- // TODO ValueError?`
`1007`		`- RETURN_FALSE;`
	`1005`	`+ RETURN_THROWS();`
`1008`	`1006`	`}`
`1009`	`1007`	`}`
`1010`	`1008`
`@@ -1050,8 +1048,7 @@ PHP_FUNCTION(dba_fetch)`
`1050`	`1048`	`if (key_ht) {`
`1051`	`1049`	`key_str = php_dba_make_key(key_ht);`
`1052`	`1050`	`if (!key_str) {`
`1053`		`- // TODO ValueError?`
`1054`		`- RETURN_FALSE;`
	`1051`	`+ RETURN_THROWS();`
`1055`	`1052`	`}`
`1056`	`1053`	`}`
`1057`	`1054`
`@@ -1184,8 +1181,7 @@ PHP_FUNCTION(dba_delete)`
`1184`	`1181`	`if (key_ht) {`
`1185`	`1182`	`key_str = php_dba_make_key(key_ht);`
`1186`	`1183`	`if (!key_str) {`
`1187`		`- // TODO ValueError?`
`1188`		`- RETURN_FALSE;`
	`1184`	`+ RETURN_THROWS();`
`1189`	`1185`	`}`
`1190`	`1186`	`}`
`1191`	`1187`