From 88a911c0c5cad3b881f8690726abf92849919f10 Mon Sep 17 00:00:00 2001
From: "Stephen R. van den Berg" <srb@cuci.nl>
Date: Wed, 17 Jun 2020 07:10:10 +0200
Subject: [PATCH] pgsql: Skip already imploded portals.
---
lib/modules/Sql.pmod/pgsql.pike | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lib/modules/Sql.pmod/pgsql.pike b/lib/modules/Sql.pmod/pgsql.pike
index 602fb09b42..631f8a025d 100644
--- a/lib/modules/Sql.pmod/pgsql.pike
+++ b/lib/modules/Sql.pmod/pgsql.pike
@@ -1221,7 +1221,8 @@ private void startquery(int forcetext, .pgsql_util.sql_result portal, string q,
Thread.Thread(startquery, forcetext, portal, q, tp, preparedname);
else
startquery(forcetext, portal, q, tp, preparedname);
- throwdelayederror(portal);
+ if (portal) // Catches race where portal already imploded
+ throwdelayederror(portal);
return portal;
}
--
GitLab