v1-0001-Fix-an-issue-in-PostgreSQL-Test-Cluster-psql.patch
application/octet-stream
Filename: v1-0001-Fix-an-issue-in-PostgreSQL-Test-Cluster-psql.patch
Type: application/octet-stream
Part: 0
Message:
Re: Make all Perl warnings fatal
Patch
Format: format-patch
Series: patch v1-0001
Subject: Fix an issue in PostgreSQL::Test::Cluster:psql()
| File | + | − |
|---|---|---|
| src/test/perl/PostgreSQL/Test/Cluster.pm | 9 | 6 |
From df6bfd8a3958f20c4a13eda4eab3e1b5dce47e4f Mon Sep 17 00:00:00 2001
From: Bharath Rupireddy <bharath.rupireddyforpostgres@gmail.com>
Date: Tue, 16 Jan 2024 11:05:41 +0000
Subject: [PATCH v1] Fix an issue in PostgreSQL::Test::Cluster:psql()
Due to the commit c5385929 which made all Perl warnings to fatal,
use of PostgreSQL::Test::Cluster:psql() and safe_psql() with
timeout started to fail with the following error:
Use of uninitialized value $ret in bitwise and (&) at
..src/test/perl/PostgreSQL/Test/Cluster.pm line 2015.
Fix that by placing $ret conversion code in psql() in an
if (defined $ret) block.
With this change, the behavior of psql() becomes same as before,
that is, the whole function returns undef on timeout, which is
usefully different from returning 0.
---
src/test/perl/PostgreSQL/Test/Cluster.pm | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/test/perl/PostgreSQL/Test/Cluster.pm b/src/test/perl/PostgreSQL/Test/Cluster.pm
index 406c405015..e2e70d0dbf 100644
--- a/src/test/perl/PostgreSQL/Test/Cluster.pm
+++ b/src/test/perl/PostgreSQL/Test/Cluster.pm
@@ -2012,12 +2012,15 @@ sub psql
# We don't use IPC::Run::Simple to limit dependencies.
#
# We always die on signal.
- my $core = $ret & 128 ? " (core dumped)" : "";
- die "psql exited with signal "
- . ($ret & 127)
- . "$core: '$$stderr' while running '@psql_params'"
- if $ret & 127;
- $ret = $ret >> 8;
+ if (defined $ret)
+ {
+ my $core = $ret & 128 ? " (core dumped)" : "";
+ die "psql exited with signal "
+ . ($ret & 127)
+ . "$core: '$$stderr' while running '@psql_params'"
+ if $ret & 127;
+ $ret = $ret >> 8;
+ }
if ($ret && $params{on_error_die})
{
--
2.34.1