Fix ERRORDATA_STACK cleanup

open-gpdb · Nov 26, 2024 · 3aae248 · 3aae248
1 parent 90bf691
commit 3aae248
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/backend/utils/misc/try_cast.c b/src/backend/utils/misc/try_cast.c
@@ -17,15 +17,19 @@ try_cast(PG_FUNCTION_ARGS)
 
     Datum funcId = PG_GETARG_DATUM(1);
 
+	Datum res = 0;
+
 	PG_TRY();
 	{
-        Datum res = OidFunctionCall1(funcId, value);
-
-        PG_RETURN_DATUM(res);
+        res = OidFunctionCall1(funcId, value);
     }
 	PG_CATCH();
 	{
-		PG_RETURN_NULL();
+		fcinfo->isnull = true;
+
+		FlushErrorState();
 	}
 	PG_END_TRY();
+
+	PG_RETURN_DATUM(res);
 }