bugfix: license_query() may crash if license is not loaded

heterodb · Mar 14, 2023 · 374b150 · 374b150
1 parent 69fa791
commit 374b150
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/next/extra.c b/next/extra.c
@@ -127,6 +127,8 @@ pgstrom_license_query(PG_FUNCTION_ARGS)
 				(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
 				 (errmsg("only superuser can query commercial license"))));
 	license = __heterodb_license_query();
+	if (!license)
+		PG_RETURN_NULL();
 
 	PG_RETURN_POINTER(DirectFunctionCall1(json_in, PointerGetDatum(license)));
 }

diff --git a/src/extra.c b/src/extra.c
@@ -138,6 +138,8 @@ pgstrom_license_query(PG_FUNCTION_ARGS)
 				(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
 				 (errmsg("only superuser can query commercial license"))));
 	license = __heterodb_license_query();
+	if (!license)
+		PG_RETURN_NULL();
 
 	PG_RETURN_POINTER(DirectFunctionCall1(json_in, PointerGetDatum(license)));
 }