From 1d53c436a8cde34229474cece73113f871be78f9 Mon Sep 17 00:00:00 2001
From: "Stephen R. van den Berg" <srb@cuci.nl>
Date: Sat, 1 May 2021 14:51:20 +0200
Subject: [PATCH] pgsql: Exceptions in backtrace protection.
---
lib/modules/Sql.pmod/pgsql.pike | 2 +-
lib/modules/Sql.pmod/pgsql_util.pmod | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/lib/modules/Sql.pmod/pgsql.pike b/lib/modules/Sql.pmod/pgsql.pike
index bff071042f..f8b5fed02a 100644
--- a/lib/modules/Sql.pmod/pgsql.pike
+++ b/lib/modules/Sql.pmod/pgsql.pike
@@ -87,7 +87,7 @@ private Thread.Mutex resyncmux;
protected string _sprintf(int type) {
string res;
if (!this) // Not in destructed objects
- return "";
+ return UNDEFINED;
switch(type) {
case 'O':
res = sprintf(DRIVERNAME"(%s@%s:%d/%s,%d,%d)",
diff --git a/lib/modules/Sql.pmod/pgsql_util.pmod b/lib/modules/Sql.pmod/pgsql_util.pmod
index e675b162ec..256f27ddd7 100644
--- a/lib/modules/Sql.pmod/pgsql_util.pmod
+++ b/lib/modules/Sql.pmod/pgsql_util.pmod
@@ -718,14 +718,14 @@ outer:
private string _sprintf(int type) {
string res;
if (!this) // Not in destructed objects
- return "";
+ return UNDEFINED;
switch (type) {
case 'O':
int fd = -1;
if (socket)
catch(fd = socket->query_fd());
if (!this) // Not in destructed objects
- return "";
+ return UNDEFINED;
res = predef::sprintf("conxion fd: %d input queue: %d/%d "
"queued portals: %d output queue: %d/%d\n"
"started: %d\n",
@@ -827,7 +827,7 @@ class sql_result {
protected string _sprintf(int type) {
string res;
if (!this) // Not in destructed objects
- return "";
+ return UNDEFINED;
switch (type) {
case 'O':
int fd = -1;
@@ -1827,7 +1827,7 @@ class proxy {
private string _sprintf(int type) {
string res;
if (!this) // Not in destructed objects
- return "";
+ return UNDEFINED;
switch (type) {
case 'O':
res = sprintf(DRIVERNAME".proxy(%s@%s:%d/%s,%d,%d)",
--
GitLab